I am getting exactly the same problem so am hoping you can advise me how you managed to resolve the problem. I'm thinking it can't be the diverter valve because when the HW is switched off the diverter valve deactivates to it's default state and you (I) get hot water, to the valve is...