Just to close this off folks, it turned out to be the pump.  I've replaced it and the car is now starting fine though I've not yet been out in it.

My word that lock ring is a pig to get to!

Read More...