So, this weekend's work proved that the 21fp4c does indeed work, with the added benefit of a cool radioactive blue glow at the join line where it was rebuilt, only complication was attaching the mounting bracket for the yoke/ pincushion assembly, I have yet to work out how to deal with lack of centering, as it was originally done with the focus PM, I will have to see what I have in my junk pile from projection tubes.
As for the bad 5u4gb, must have been bad from the start, new one will take a while to get here, is it safe to keep running on 1? grab one from another set?
There is still a bunch of minor suff to do, but it all seems to be working, and I don't think I will be able to get rid of ALL the audio buzz as long as I am using a cable box as source.