I would defintely look at the pump relay first. I recently had the relay fail on my 92 plus 4 with M16 engine. Look just above the clutch pedal and you will see two relays. The left being the fuel relay. The wording on top of relay was BOSCH 0332014 112
12 V 304. I put the Bosch number into google and hey presto bought two for £26 - the spare going into the glove box.