Our 2GM had similar symtoms - without the advantage of a new pump.
Sent the injectors off to Mac Boring for refurbishing, and all is
pretty much well again.
--