Having just restored a couple of power supplies, I can say that Console5 kits are the way to go. Match up your part number to theirs and then add the rifa caps you need from their stuff. If you have questions about which kits to buy, just ask them, they have a quick turn around on orders.
If you really want to future proof, the all in one power supply kits are the most reliable and stable solution IMO. https://www.reactivemicro.com/product/universal-psu-kit/
I've replaced capacitors when the power supply was still working, but had lost their rifa and other electrolytic components. I've also put in replacement kits when the transistors or transformers had failed. I hope this helps a bit.