So, I guess I will try and touch it up this Sat, gonna have to get to it soon anyway as one of the fans I have on the back is starting to make noise and has to be lubed, most likely due to the cold.
So I'll assume the parts on the neck are correct for now.
As mentioned, the biggest pain I have with it is the nonlinearity of the R/G horz lines on the right side, always been a pain on this set.
As suggested, gonna start with vertical height and linearity, and perhaps vertical and horizontal centering if needed, before going to convergence, however my test generator has no output to do height and linearity, I do have the Digital Video Essentials DVD, and hidden deep in a horrid to navigate menu system is the right tools and screens to do so, it's just a nightmare to find it!