You did a great job for the capacitors selection! 👍👍
Some suggestions:
IMO, if you want those radial capacitors sat nicely on the PCB, lead spacing is important, and its diameter as well. Newer capacitors for the same rating tend to be smaller, you can choose higher voltage rating capacitors to match the existing space.
For surface mount capacitors, "land space" is very important! Please measure the existing space to ensure the replacements can sat and soldered properly.
If size is permitted, you may also consider Nichicon PCX series for its excellent ESR and Ripple Current rating.
https://www.digikey.co.il/en/products/detail/nichicon/PCX1H220MCL1GS/2791250
https://www.digikey.co.il/en/products/detail/nichicon/PCX1H220MCL6GS/2791249
IMHO, YMMV. 🤞