I have a similar problem with my Valliant Combi Boiler and it seems that it could all be down to the diverter valve getting stuck. They are about £100. However they were selling some types on ebay for £60ish if you've got a bit of KNOW HOW and know which one you need!
Either way unless you...