The link might be broken.
Anyway, why do you want to upgrade if you haven´t taken it yet? If you are to upgrade, then why don´t you build a system yourself?
If you build it, apart from saving money, you will be able to get only what you want.
As for the PSU, 400 watts is only suggested by the manufacturer.