Finally got round to fitting the new main thermostat, two thermostat bypass valves and an alternator/aircon drive belt that I've had kicking around for a couple of months.  Start to finish took about 3.5 hours taking my time/care.  Looking forward to a car that hopefully warms up in winter now!
Next job, suspension overhaul...