I finally got my car back. The dealer replaced the water pump (they went with a NAPA part this time) and the car seems to be running fine so far, it's actually running a little cooler (only in the N in Normal instead of the O). The real test starts tomorrow when I take it from PA to Mississippi. My CEL still comes on, but now it goes off. Not sure what is causing that, but it might be my fuel injectors, it hesitates a little bit when it's cold, but stops after it warms up. I'm still going to try to get Ford to reimburse me for the pump, but it'll probably be a cold day in hell before that happens!