Originally Posted by phil200tdi
Ah I mis-read it..
Ah me too. In that case most likely the pump. However it doesn't help the OP as he is still out of warranty.
OP does your current software prime the fuel pump and do you hear a whine when you unlock the car?
As Phil200tdi mentioned, this is a good time to get the intake valves cleaned. Definitely worth considering.