All sorted, took the door off this morning and indeed the bottom bush pin was worn.
I swapped the top and bottom ones over and door swings normally now, catching the latch fine.
Will order a couple of bush pins and they should see me for another 7 years….. replaced the heating element last year.