After a little more tweeking, mainly with the lock keeper I got the first door lining up pretty well. I'm just finishing it will a little filler/bondo.
Just hope it goes back in place after I take it off for painting.
Still haven't tightened that wedge.