The story so far,
I have changed the flow switch for a spare.
I changed the PCB for a spare whilst inside and the pump isn't running constantly anymore.
I have changed the dhw he for a spare and on the face of it that seems ok
I have now changed the Primary Thermistor, which was...