When I put my motor back together it was overheating also... What I found out that I had no t-stat, from what you've stated so far I would change the the t-stat. I would also change the water pump $35.00 and about 30 min 1hr of work and that should correct the overheating issues.