18000uF is pretty big for these power supplies ... let alone 20000 and 25000.
There is a point of diminishing returns on cap sizes plus when you start getting too big then you run the risk of burning up diodes within rectification circuit due to ripple current.
I would go with whatever the original design called for and stop there.