I gotta concur, all signs thus far do point to the CRT re. the focus problem. Also, messing with video IF alignment would be like adjusting the brakes hoping to fix the carburetor.
And while not a big deal, there's still the hourglassing problem indicating power supply ripple.