I can recomend Cornell Dubilier capacitor 383lx series. They sound good in power supply and have a huge number of voltages and values.
Nichicons are good too. I also agree than 63v is better than 25v if there is enough place in box. 63v from the same series have smaller cos Phy versus 25v.