Found that the color killer was wonkey because of incorrect chroma amplitude, a tweak to the color take off and bandpass transformers fixed that. Then all it took was a few minor tweaks to the 3.58 CW transformer (which adjusts the phase of the local oscilator going to each demod), and along with a touch up of convergence and CRT drives it's good enough to call done!
Now I'll move it into the living room, and start enjoying it.
