Got it to the point where the picture fills the screen with decent linearity, which was just a bunch of carbon comps in the vertical section that had drifted high. Cleaned out the remaining pots, so they all behave now. Last remaining issue is no sound, it seems to be detuned somehow because I can hear static but adjusting the coils doesn't seem to do anything. Tomorrow if I have time I'll have a poke at it with the sweep rig, but I have a feeling there's a bad coil in there somewhere.