Thermostat done today with big help from TJG!
Seems fine now, will have to keep an eye on coolant level for next little while is all.
Went out this morning before fitting it and still took ages. New thermostat and replaced coolant and 90° reached in proper time again.
Easy enough, just a bit fiddly.
Great!