If that's cheaper then go for it, especially if you want to substitute any one of the components.
The 12.5 Amp PSU should be plenty. IIRC, the other option was only 7.3 Amps which could be a limiting factor if you ever need a 1200oz motor for your Z axis like I have.
I always upsize my PSU's by...