B&K 465 weak voltage

[Aperna1985]

I've had my B&K 465 for about 8 years now. It's actually been a really good tube tester and I've used it to rejuvenate quite a few tubes. I noticed that anytime G2 voltage is 50 volts on a tube it tests very bad. So today on a hunch I used the tube pin out and checked the G2 voltage what should be 50 volts was only 20. I think the original components are starting to fail. I attached the schematic below. Judging from the drawing other than the Transformer they seem to be what makes up the main power supply for the entire tester. Am I right in thinking that if I replace the two 5 microfarad capacitors I should be able to bring this thing back ? To me they seem like they're the main filters and maybe they're getting weak? Or am I more likely to have to go after the 4 Diodes just before them.