Andrew it really sounds like a failing HPFP, unless you have done Timing Chain, or any other Timing Components, Those Fuel Pump Driver Shaft needs to be on perfect timing.

I will replace both of them and also keep your eye on the Fuel Injectors, Autologic ha... Login to read more.