You said that your water pump is still cover by your warranty, so your engine is to. Ford would probalby replace it (short or long block, not the entire engine) if the water pump cause further problems, stick with your story that you stop when you saw the temp gauge was high.
I'm working as a mechanic for a Ford dealer in Montr�©al, just curious where you sent your car.
Nic.
