Ok chaps, had another look at the boiler. There is heated water from the primary heater going into the tap water exchanger at a constant heat but at the outlet the heat varies from warm to hot. There is also an audable click that sounds related to this. Would this be the diverter after all...