Oldish Worchester boiler, had problem with water supply, since then I have limited warm water ( not hot ) If I put the heating on ( that is okay ), we get moderate warm water. I have had the diverter valve replaced, but getting worse. Could the repairs to my water supply, and muck in the supply...