I'd get a 900 series card. (Inb4 everyone shoves the 980 ti down your throat.) I have a friend who recently invested in a 960, he keeps up pretty well.
On the second plan, the AMD Fx-8350 isn't too bad and will work fine for you. (Ofc, I reccomend Intel because I'm a fanboy, not even going to deny it.)
On the second plan, get a better PSU, that gives you the ablility to upgrade in the future. Get a 650W. (Just more future proof.) However, if thats not your concern, then the 450W would be fine.
All in all, the second plan is a better rig, however I would highly reccomend an aftermarket CPU cooler. Get a 212 Evo, they are a bitch to install, but the performance is quite nice.