All done, its amazing how small modern caps are I went for a mix of Panasonic EE and FC series capacitors.
I tested all the caps that come out, the ones on the left (plus the RIFA's) are out of spec, 1 is short, 1 is 10% and one 50%, the ones on the right are frightfully on spec, like...