Well flushed the heater matrix out, installed a new heater control valve, heater works great now, just gotta keep an eye on the engine heating up.
Turns out I also didn't screw the expansion cap on tight enough, its very tight now and seems to hold the pressure much better now.

Cheers