Although it sounds like the pump to me, I'd change the filter first because it's WAY easier to do. If that don't fix it, either just live with it (if the fuel rail pressure is good) or drop the tank and swap that sucker out. I just swapped out a dead pump on my rusty WJ, and it was a Royal PITA. It took a whole can of PB Blaster, my longest breaker bar (and a pipe), M12x1.75 tap, new bolts, three trips to the parts store, an old pillow, and a 6'1" arm-span to disconnect the fuel lines with a fuel tank laying on my belly under the Jeep.
Yeah, can't wait 'til my son is old enough to be my helper.