Out of curiosity, have you replaced the fuel filter?  I'm dealing with
similar issues, and was about to go out and replace the filter.  I've also
had issues with the fuel pump connections, which are no longer protected by
the rubber boots.  Does anyone know where to obtain said rubber boots?

Karl Wolz