I switched to a different head unit with a good 21FDP4 in it and was surprised that it didn't look any better. The set takes about 5 minutes to fully warm up and stabilize and the picture isn't very sharp.
B+ is about 10% low which might account for these issues. First I think I'll try swapping out the ancient silicon rectifiers with some 1N4007s.