Had this exact problem - Changed the diverter valve - £53 as the old one did look full of gunk. Cleaned the small diverter pipe, again this had some debris in there. Assembled everything back together and the heating did seem to work for a little bit of time, but then nothing again.
Left it a...