Gaming PC Upgrade advice- New CPU or GPU?

[Tin88]

Looking to upgrade my Gaming PC before the Windows 10 update cutoff at the end of July. Budget is under $1000. I am currently looking at a Broadwell-E 6800K/X99 motherboard rather than a new GPU. I am open to upgrading either one and would be looking at the Nvidia 1070/1080 if upgrading the GPU. Any recommendations welcome. The PC is used for daily Internet browsing, gaming and minor video editing/encoding.

Current Rig
i5 2500K- 4.5Ghz OC
Asus P8Z68V-Pro Motherboard
16GB Corsair Vengeance Ram 1600mhz
GTX 670 FTW 2GB in SLI 1175mhz boost clock
1250 watt XFX Gold PSU
Coolermaster Hyper 212 + push/pull
NZXT 810 Switch
Samsung 830 128GB SSD- OS Drive
Samsung 840 EVO 500 GB- Steam Drive
Seagate ST1000DM003 x3
LG 23" 1080P Monitor

 

[Ryan_78]

I'm looking at a new rig
keep everything except mobo, cpu, and gpu and ram. wait longer till you have like 2000$ and get a new beast.

 

[Tin88]

I could spend $2000 now but I don't think its necessary and would rather not..... I was leaning more towards the new CPU/Mobo upgrade so I could use my old setup to upgrade my Home Media Server.