Should I Upgrade to HAF X and other components?

I have built a gaming pc last year (specs are at the bottom) but my case was never an actual case as such. I built it myself from just the skeleton of a very old cream case.

Now the problem I have is that its a bit squishy and isn't really all that much room for upgrades. And also the PSU is mounted at the top of the case which is something I am definatly not a big fan on.

I did mod the case an extreme amount to the point of it having no fans at the beginning but now having 5 case fans with room for one more. If I had to describe the way this case looks and may perform, I would have to say it is very similiar to the Antec 902, but without the big fan on top, instead there is 2x 120mm coolermaster Blue LED fans.

So my question is, would the HAF X be a good upgrade?

I have been looking at this case for a while and im still trying to decide between the HAF X or HAF 932 as both are relatively similiar but the position of the USB 3.0 ports on the 932 are a little off putting, but then again the 932 comes with dust filters etc.

I am also definatly considering an upgrade, with another 460 and a new PSU. I was thinking a OCZ Technology ZX Series 1250W Power Supply? I know this is overkill for 2x460's and an i5 but i will be soon hopefully upgrading to either ivy bridge (when released) or the i72600k until then. Also im upgrading to 16GB RAM and im considering that waiting off on the GPU and just upgrading to a better one like a 6970 later on and that way i can buy another one of them later on. Instead of 460's in SLi now.

Feel free to add your suggested parts that I have listed i want to upgrade, and your thoughts.

Cheers!