If you have not done it, I would be replacing the s shaped rubber hose that bypasses the thermostat to circulate water when cold - it joins the back of the water pump to the lower thermostat housing. It is out of the way and out of side and if it splits takes for ever to determine it is the culprit and it is difficult to change with everything on the engine in place.
Garry

