Hi guys. I have a baxi 105e and having issues with hot water. Seems to work fine when heating on. However when heating is off takes a lifetime for water to heat up. No fault lights flashing. Have already replaced the dhw diaphragm and thermistor. Considering replacing the whole diverter valve...