System was pressure tested and all fine. Decided to change the heater matrix as a last resort. Seems to have done the trick despite being able to run water through the old matrix. Decide to cut open the old matrix and found it to be full of a murky sludge which definately would have reduced flow. Fingers crossed its solved this problem for good.