Drained the dam thing completely today, flushed out rad and heater matrix with a dishwasher tablet. Filled up again as per RAVE and had no problems so far today with it getting hot but to be fair it hasn't been the warmest of days.
Will hold off on the thermostat for the moment and see what...