Better Upgrade: New Board/CPU/RAM or Video Card

[Guarana [BAWLS]]

So last year I built a new HTPC for myself, and... well... made a couple mistakes.

CPU AMD FX-8230E w 16GB RAM
Video: GTX950 2GB

So, currently it outputs 4K desktop resolution (because GTX 900's do that)

But it won't do 4K in any applications, because hard encoding.

Possible Upgrades:

i7 7300 + Board + 8GB RAM = ~275
This would keep the GTX950, and it would add 4K Hardware decoding to the CPU

Upgrade 2:

950 --> GTX 1050TI = 165 (and in stock at microcenter) - and the 10XX with 3GB+ will hardware decode 4K.

Which is the better route do you suspect?

(Or do I hold off, and see what happens with new video cards and CPUs that are coming out this quarter)