Ok, quick update for those who happen to stumble across this in the future.

Thermostat tested ok, but, as mentionned above, I decided to get another one anyway.
Flushed the heater matrix and it's positively roasting in there now

Thanks for the tips lads.