Thanks for the tips. I've used MAF cleaner on the MAF once before, but I'll give it another spray. And I'll replace the fuel filter as well.

I'll have to take a loot at the service manual to see where the fuel pressure switch is. The EGR should be easy enough to replace.