Broadwell-E, Skylake or Zen?

[GoogalyMoogaly]

So it looks like my 3930K system is starting to give up the ghost. To be specific the Rampage IV Extreme board I'm using often doesn't detect my boot SSD on a cold boot.

So I'm taking it as a sign/excuse to upgrade.

I mostly game but also encode video.

Am I best waiting for Broadwell-E (however far away that is), just going mainstream/peasant and getting a 6700K or should I wait and see if AMD have a competitive chip in the Zen?

 

[GoogalyMoogaly]

Get a replacement motherboard?

No point going for a Skylake, Zen's an unknown.
Broadwell-E will be a meagre upgrade too unless you're going 8/10 core.

Reasonably sure the motherboard is out of warranty, plus it's Asus so I'm guessing there's little chance of that happening.
Not sure how easy it is to get a new X79 board now either.

Plus, excuse for shiny new stuff!

I do worry that Skylake would seem like a downgrade. I'm guessing the only thing I do that really pushes my CPU is video encoding, which does make use of the 12 threads. So skylake would need to be 50% faster per thread just to be level with it.
Although whether I do enough encoding to make it worthwhile is also questionable.

I have a Haswell 470K and I'm disappointed with the temps, probably due to the TIM used between die and heatspreader. I'm hoping that won't be an issue with Broadwell-E but may well be with Skylake.