Gary, sorry but I just saw this thread.

I would start by checking the fuel delivery to the HP pump. I use a special fitting that replaces the pump inlet fitting and facilitates pressure and volume testing. [When you do the volume test look for water in the f... Login to read more.