New door hinge?

I have noticed the RH door upper hinge ‘catching’ on the ‘door stay’ pin/rivet mechanism but the LH side clears it by miles! Make sense being the drivers door if ware has caused it to sag. Have also noticed on the forum that changing the pin is a major pain! With fitting a less worn or new hinge an easier option. I am trying it without the RH door on the hinges and not sure if fitting the RH door would make a difference or if its time for a new hinge! Unfortunately the RH door is away at the panel shop at the moment. Also I noticed that the A pillar 14 hinge bolts had the incorrect addition of machine washers; only lock washers should be fitted. This made the doors difficult to shut as the machine washers made the bolts sit too high and knock on the hinge.