55.2-59 Door alignment issue / help

[QBRacing]

Hey all.

I spent countless hours this week trying to align my doors but i just cant get it right.

On my drivers door the front rectangular section at the windiw base needs to come out more (see pic 1) as even without the door rubber its just touching the a pillar.
The second problem is that the lower rear section is too far out. (See pic 2)

I have undone the main 6 bolts that hold the hinge to the a pillar pockets but just cant get enough travel to correct either issue.

Am i meant to use shims between the door hinge and door frame? To me this looks to be more for front to back alignment (which im gaving an issue with on the passenger side) but thats a different problem for another rainy day

Any help, pics, video links appreciated

Q