After shimming and refitting the door, I think I am going to bite the bullet and just change the door since I have a spare. The gaps are good but the shape still doesn't closely match the body. Comparing the other door I have to this one I've been working on, the main body line area is about 1/4 inch low using a straightedge, the other door is nice and straight. Oh well, I'm better at mixing filler and applying it now...