Given, from the style of writing in the Service Source manuals, Apple's evident expectation about the expertise level in its AASPs, and given also that the Service Guides that I referred to mention 'CRT and yoke assemblies', it may well be that carefree swapping of those will meet problems. Anyone who can deal with differences in yokes and analogue board to video card cables can very probably overcome the rev.A/rev. B conundrum without tears.
Alternatively, as you suggest, swapping only the CRTs may be the Occam's Razor that is needed. That does, though, for the timorous, raise the spectre of 'live' realignment of the CRT.
de