Are you 100% sure it's over heating? Is the water actually too hot?
Or is the gauge reading that it's too hot, but it actually isn't. Reason I say this, had identical symptoms some time back; fine under no load, or revs. As soon as it was loaded or revs the gauge used to shoot up, all down to...