I agree that the fuel pump sounds suspect.
Keep in mind that any "I just replaced my fuel pump" testimonials are only apples to apples on a returnable fuel system. The returnless (late model, ~99 and up) pumps are known to be junk, where the early fuel pumps are much more trouble-free.
