I build computers part time, if you need help with anything further I'll help, but it seems like you got it under control at the moment.
Oh and by the way, speaking from experience NVidia > AMD. AMD may be like 30 dollars cheaper for the same power, but AMD consistently fucks up their drivers, has worse customer support, smaller compatability with upcoming technologies (NVidia GSync, PhysX to name a few) and is usually the card you hear about having problems with new games (for instance, RAGE). Having switched from AMD to Nvidia, I'd reccommend NVidia any day. It's the same situation with the CPU, but less prominent.