Right ChrisR, think I understand how the heating up works.
Left picture is the CH, hot water comes from heat exchanger, down the red pipe, diverter valve should send all the water down the CH flow pipe.
Right picture is the DHW, hot water comes down the red pipe, diverter valve switches...