I have the same problem. I've been living with it, but its getting worse - hot water is scalding hot and then the overheat shutdown operates. Did you find out if the problem was with the modulator? it seems to me that the modulator will only modulate if the DHW thermostat is operating.
Jeremy, April 2006