Problem w/ Door Hinge.

[Dingfodgy]

Hi ya'll....finally got the cab in a place where I could re-hang a door to check gaps and whatnot. Here's the problem(s).

1. The top outside bolt on the upper hinge hits the hinge plate and won't let the door shut all the way. Everything is tight and aligned, so I'm wondering if anybody has run into this issue and what they did about it.



2. The door gap on the latch side of the door is about 3/8"! I have the door slid back on the pillar as much as I can. Do I;
a. Do the Kevin Lewis (rokcrln) thing and weld some .125" filler rod along the edge of the door?
b. loosen the door-to-hinge bolts and slide in some shim plates to move the door back some more?