Thanks, yeah so that flow diagram too. Thing is, my instinct is that the thermistor is just doing it's job and cutting things off when they start to overheat. I guess PCB would be the low hassle solution, pretty cheap to get replacements too.
FWIW, the CH flow is slightly warm, return is...