I have had the same problem, only hot water when heating is on! Diverter valve £90 from local plumbing parts but £ 50 from eziparts couldn't wait, pig to drain & fire up after but deffo the cause, diaphragm was split. Symptons sneak up on you but if you only get hot water when heating is on then diverter is yer man!
tom
April 2006