I'd keep the i7 to be honest, there does seem to be a trend towards better multi threading in games. And normally I'm a bit pro-AMD, but right now I think Nvidia is the better choice in the 980 range. Definitely wait for the new generations of processors to come out though, if Zen and Polaris are as good as they say you'll want to consider switching over to AMD.
Also, I'd put in a larger SSD. My C drive is 120GB as well, and it's feeling a bit cramped.