Looks like you got this one under control, congrats !
Here is an IIRC. C line flats had 2 caps on the FBT board.
D & E line had 2 on FBT board & 3 more under the chassis.
Early runs of upright CC2 sets also used 22-5001 caps
before the switch to 4 lead caps. Always best to change them
all even if they look & test good. Just one bad you may not see
but they do cause subtle problems & stress the hoz out &
HV components.
The sockets we stocked had long leads & some push on connectors.
That way it fit all sizes & gave a factory look, very important to
me but not most others. Only other sets I remember with
common socket problems were the early RCA in line CRT sets.
Filament pins would corrode & melt the plastic on the CRT &
socket. Found lots in Admirals & Maggys, the RCA's seemed to use
a better socket. Symtoms were int slow fading of raster etc.
Enuf fer now
73 Zeno