Last week we woke to the boiler tapping constantly. Found it to be the diverter motor so took power lead off and all silent. Hot water works but no heating. Took motor off, felt the valve cartridge pop up and replaced motor. Heating then ran perfectly..... .... until we ran the hot water and then th...