Just spent a while trying to get the picture adjusted. Vertical linearity is slightly off, as is horizontal linearity, but it isn't really noticeable on a regular picture, just with a test pattern. I think I need to make the main power supply filter choke a priority now, though, as just before I turned the set off tonight, I noticed a small amount of smoke drifting upwards from underneath the chassis at about where the choke is mounted. I'm thinking I'll replace it with one of these units from Edcor:
https://www.edcorusa.com/p/770/xc50-0_5h-250ma
It looks about right. The original choke is 0.4H at 250ma, and this one is 0.5H at 250ma. Unfortunately, the shipping from Edcor is about as much as the cost of the choke itself, so it'll be a little over a $30 purchase, total. Also, I'm not sure about the dimensions yet, but I think if I want a brand new filter choke, that's definitely my best option.