Well I did the head gasket again, taking a lot more care over the scraping this time, and it seems to have failed. Again.
Symptoms are grey/white smoke, mayonnaise under the filler cap, coolant level dropping rather a lot, and seemingly higher than usual pressure in the cooling system...