What do I upgrade

Your CPU could bottleneck your setup slightly if you're going for a 1080, even with a 1070, although it shouldn't be too bad.
I'd still suggest you to get a 1080 and perhaps in the future upgrade your CPU.