I had a similar overheating situation a few years ago on my 1983 #385. After much trouble-shooting with no success, Mack Boring suggested replacing the water pump. Although I had already replaced the impeller and cleaned and checked many other parts, in desperation I replaced the pump and the problem was solved. I think it was about $185