I would make sure my radiator cap is good. I have seen thermostates cause some problems that you describe.If it was the water pump you should see some coolant running down the side of the oil pan by the drain plug from above. I would drop a thermostate in it put a new cap on it and make sure you get all the air out by turning on the heater.
