So, to return to this with some feedback, I have finally got around to have a look at the car. The problems all stem from bodged attempts to cure the hot starting problem. I managed to tweak the pump until I got withing the 45-55% modulation range, and that has made the car much more driveable...