Well I finally got around to looking at the locks today, turned out the drivers door problem was a result of the door latch bing as dry as a bone, so lots of GT85 later and I'm all working again!
Not tackled the springs yet, it was a bit cold to be outside too long today so will wait until I...