All above recommendations sound good. If you do go from the 2600k to the 2500k, I'd take the extra money, scrap that thermaltake case, and get the NZXT Switch 810.
It's great for both Air, and Water cooling, and you get a lot for the price. You can get it shipped for free on Amazon if you have Prime membership, or just sign up for the trial and make sure to cancel in time.
SSD for OS drive is nice, but not essential. I have a 64gb OS drive and 1tb spinpoint for my gaming rig, it works out nice. I have about 50 or so games installed on Steam at the moment, and still a good amount of space for other files. Too bad you missed the recent Crucial M4 sale on newegg, they had 64gb drives for $65.Edited by anubis1127 - 3/2/12 at 11:38am