What are signs a fuel pump is going bad?
 

I know I have always been able to hear my fuel pump whine, but the the other day it seemed louder them normal. My car was surging a little bit, and you could hear the fuel pump change pitch in time to the surge of the engine? Does that mean the 130k mile stock pump is ready to crap out, or is it not big enough for my combo?

I would definitely say your fuel pump is a little small for your combo and that might account for the change in pitch. The way I found out my pump was going out was when it just quit. The car was idling, and I was talking to some friends and the car died, no warning.