Ok so the gasman came back today. Aswell as cleaning and changing the filter, he has now removed and expected the pump and fitted a new 16 plate heat exchanger. Boiler is now running and hasn't cut out yet, but my flow is still not great and the water is still very very hot. He said he will come...