Wahoo!
Now, can you adjust the vertical linearity so that the squares are more the same height on the top & bottom? Often, you need to go back & forth between the vertical linearity and the height adjusters to get this right, since each adjuster may affect the other somewhat. If you do find that they're affecting each other (for instance, changing linearity also affects height), tweak each one a little bit each time, rather than trying to make it perfect all in one adjustment.
The vertical linearity shown in your last photo isn't awful, but if you can easily make it better with a little adjustment, why not?
Phil Nelson
Phil's Old Radios
http://antiqueradio.org/index.html