Months later and I'm still poking around with this set. I was able to almost completely eliminate the ringing on the left by swapping through a few 19BG6s.
I then realized I had way too much width and height as this set has a rectangular mask. A few hours of playing with all the adjustments resulted in a smaller raster with pretty good linearity.
Then I finished polishing the cabinet and cleaning the knobs.
Hands down the most frustrating set I've worked on, but it's finally done.