I've heard about new architectures coming out next year, so maybe there will be a slight price dropdown, so you could take advante of it and buy 980ti.
I would upgrade since, as you say, you'll have no problem with the scalling and the power consumption is a huge factor. I wouldn't go for the...