Yup, and if you're willing to make these changes and spend that much money, I highly suggest the PSU I recommended. It's a very good quality PSU. The wires also come in a cloth so they're not all over the place and the inside of your computer will look neater. (Not looking like a crap ton of ties everywhere.)
As does the one I suggested offering more power at a much more affordable price.