I see you replaced the 6KV caps with ceramic discs. This will work for the HV and horizontal circuits but not for the vertical. You will have vertical hold drift after warm up. I did the same thing with my TS-18 chassis and had to change the caps for the tubulars from Allied Electronics.
Regarding the focus, check/replace all resistors in the HV and focus circuits. Check the focus pot for correct resistance. If you can get a probe, you will also want to check the high voltage. It should be around 6KV.
Not only does the convergence look good, the greyscale is nearly spot-on too.
