I have done what I think is everything to fix this. I have taken off the heads and all cooling jackets drilling out all the blocked holes etc replaced the poppet valve and associated spring etc. Replaced the water pump impeller. Tested the therostats and heat sensors they all seem to be working...