[A//// Guy]

I highly doubt your fuel filter is clogged with only 40k on the clock, you also would have noticed junk on your pumps prefilter if that were the case, but Id replace it anyway just to rule it out. Im leaning toward your pump being the problem.