Before you do all that, try adjusting the hook bolted on the pillar, these are adjustable and get pushed in by the door latch over time. Slacken the bolts, move towards the outside edge a bit, tighten and try the door. Small adjustments should get it working Ok, just fixed a door and boot on two of my cars this way.