Hi it sound like the diverter valve is passing through when on water only, try it , put it on and feel the flow pipe to the heating pipework as its coming out of the boiler, it should not get hot at all, only when calling for heat after the water has been turned off, these are quite...