For reference, the unit will be the HP EliteDesk 800 G2 Tower with a 400W Platinum PSU, the other option was the HP ProDesk 400 G3 Tower with a 300W Bronze PSU. But yeah, I think I'm leaning towards the 400W right now, and I guess I will just upgrade the PSU in a few years if upgrades are needed.