I saw some other posts on this but here is my solution for others. Engine only overheated after a couple of minutes at idle, not at full speed.
Temp was reading 140-160deg on heads using laser temp guage.
Changed water pump, poor condition but no better temp when finished.
Changed thermostats...
