Ok...established that either waterpump or thermo have lived its last breath. So I will be doing a cooling system overhaul..replacing thermo-housing (aluminium), thermostat & waterpump (metal impeller).
As for the fan clutch, I plan later this year to do the electric fan conversion so we'll leave that the way it is.