Had this problem today, if you can feel the heating flow pipe getting hot when the HW demand light comes on (tap running) , then the primary side of the hw heat exchanger is blocked and water escaping back up the flow, it will not be the diverter valve.
karlos
July 2009