I would go ahead and replace the pump with a Ford Lightning Pump and be done with it. Even if yours is good (from your description, it sounds like it's GOING OUT as we speak), it's cheap insurance and easy to do if you have any mechanical skill at all. The pump cost about $90 from a Ford Dealer or online and takes about 45 minutes to put in. Do a search for the Lighting Intercooler pump, and I think there is a How-To in the How-To section of this forum. I wouldn't even bother taking it to the dealer for this, as they have no idea how to diagnose it and will want to replace sensors and other crap before the pump.