It should be easy to determine where the noise is coming from, open the fuel filler cap (engine on) you should hear a nice whirring sound if anything at all. Then listen to the underbody pump, if it is groaning, it is probably on the way out. The underbody pump is by far the easier to replace. The in tank pump is a nightmare.