Ok, I'm in work now, but tonight I'll cut the power to the house and see if the switch then moves to W, i.e. no demand.
The stat on the hot water tank is set at 70c, I can turn this down to 60, will that help? I guess what's missing here is what happens when the switch is midway, CH and HW...