I had a similar problem when putting my car back together after a respray. (it was fine before iI removed the door)

The top of the door was tucking in whilst the bottom was sticking out slightly. I ended up making a few very thin shims out of alluminum to sit behind the top bracket. Straightened out the door nicely, and no leaks.