Being a AMD fan this is what i would do you your 2nd build being someone who likes to save money:
Switch CPU to:
http://www.newegg.com/Product/Produc...82E16819113291
saves you 100$
Switch Video card to:
http://www.newegg.com/Product/Produc...82E16814150641
saves you 200$ ( I bought 2x of the 1GB models of these over blackfriday for a mining machine i'm building so can let you know in a few weeks how they holding up.)
Can use:
http://www.overclock.net/t/502403/gr...-updated-daily
to checkout video card rankings.