As you can see my hot water heater is not up to temperature and I have about a 40 degree differential temperature across the supply and return lines for my water heater.
The water heater acts like another heat exchanger and can throw off readings and overheat findings. Your supply and returns from the water heater should be within about 5 degrees of each other before taking your baseline assessment.
I often hear "My engine runs fine for about 30-40 minutes then begins to overheat?". This could just be a situation of a clogged HX, sea strainer or other raw water circuit problem getting masked by the cool water in the water heater. This cool water acts like and can mimic a heat exchanger. As the temp in the heater rises the engine can no longer dissipate heat into that water and it begins to over heat.
Don't forget to write all these numbers down with both your high and low rage readings so that when and if you have an over heating situation you can easily trace it by comparing these numbers to the new readings during an over heat..