Wait for the new AMD Cpus to come out. They're going to absolutely dominate the market come OCT/NOV.
As for the GPU, I'd suggest a 1080. If not then go for a R9 380 or something cheap but way better than the 960.
- - - Updated - - -
Edit: I take that back, actually grab a RX 480 if you got the money. It puts the 1080 to shame costs over 75% less.