Build 2: I'd downgrade the HDD to a 500GB and buy a small SSD as well. Or if you can afford it, just keep the 1TB and buy an SSD either way.
I would also upgrade the 660 to a 660TI or just move up in the hierarchy to a 690. On that note, I'd also switch out the PSU to a Newton R3-600W, it would fit the case so much better and because it's modular it's easier to keep nice and tidy. Personally Id go with a cooling pad as it makes it tidier, thinking a Corsair H60/100 perhaps.