Water pump and thermostat change is pretty easy stuff. I'd get it back together and run it, if it continues to over temp check the thermostat first then look at the water pump. Are you doing the work your self? Head gasket will cause all kinds of problems. Make sure your oil is free of any coolant and your coolant is free of any oil.