Really sounds fuel related to me - have you changed the fuel filter yet??
That is the most likely cause from your description.

PK