STRIX GTX 970 is a must for you. It will lose a lot less of it's value overtime, even OCed vs the 980. I mean 343$ from Amazon or Newegg
http://www.amazon.com/dp/B00NJ9BJ8G
After that, IMO a screen upgrade is DEFINITIVELY in order. G-SYNC or lightboost monitors are good, but TBH, a 1440p IPS monitor has been my favorite despite having both. So I'd suggest an IPS 1440p monitor. Best 400$ you will spend.
Now realize that a GTX 970 STRIX does very little noise, if you want you can start going towards a more silent build, if noise if of any importance, I'd just get a 480GB SSD like you looked at before ( perhaps look at Crucial or Sandisk Extreme II/Pro ones. Going back to air cooling is a possibility if you'd like, though I doubt you want this. FT05 style case could be interesting noise-wise.
How's your headphone/headset and/or speaker situation? Perhaps you want a sound card or an external USB DAC and/or amp, maybe a good office chair for comfort (used on craigslist or an IKEA one)