Went with depends on who the people were, 1, then 2. The good of the many out way the need of a few. Also went with powerless since I have no power over my morals or ethics.
I'd go with at-least a gold rated PSU. Also you could probably drop the cooler down to say an Hyper 212 EVO and put that money you save into something else.
I say neither get an Intel like cantab said. I would also drop the aftermarket CPU cooler and grab a better quality PSU. I think there's supposed to be an AMD in there somewhere.
I'm kind of in the same place right now. I'll probably end up buy another copy and giving it to a friend or to myself so I have a copy on steam and from there store.