What do I upgrade

What are your other PC specs? Especiall your CPU, as it may bottleneck any better performing GPU.
As for a sole GPU pick, I'd get the 1080. Its only a bit more expensive than the 1070, but does perform better.