All right, I just got it back, and I made it back across town during rush hour in 100 degree weather. It still heats up a bit if it sits still for too long in traffic, but it stays under 100 C. if I leave the air conditioning off, which is good enough for now.

Time to start saving for the head gasket