Search for a thread stated by me: Fuel accumulator failure analysis and run the simple on-the-car test. This component is often overlooked, but given you symptoms, it's the number one suspect.

Duke