The system has two seperate pump for the CH and DHW, no diverter valve is fitted. The only item I have not inspected is the one way valves fitted to each pump. However these has small test plungers that you can press - seem OK. I will remove the water/water heat exchanger again today and see if...