The water pump is not that hard to change. I would replace it.
I have a 95 Contour and in one year I replaced the water pump 5 times. It was under warranty. Finally received a refund and went to Napa and they sould me a rebuilt Ford waterpump that works fine. It seems the aftermarket water pumps are just not up to specs....whatever specs they used don't seem to be correct....
