Upgrade. Where to?

[Yaayuh!]

Hi all,
I currently have a 3930K @ 4.5GHz on an X79 Sabertooth with 16GB Samsung Green at 2133+MHz with tight timings.

I want to upgrade and would prefer a smaller and preferably quieter build, M-ATX using a Phanteks Enthoo Evolv or Corsair Carbide Air 240.

I game (980Ti) and use Ableton DAW.

Do I:

Drop 2 cores and go for a Skylake z-series setup.

Or

Wait for Broadwell-E and go to that platform despite the fact Skylake-E will be Q-4 2016 potentially and require a new board.

 

[Yaayuh!]

I'm happy with the EVGA M-ATX X99 board looks good. But yes, there are limited choices really. Hopefully when Broadwell-e comes, there'll be a few more.

I know the 3930K itself is pretty good, given its age and all, but it's hot and I'd really prefer a smaller system that's quieter. Doesn't help that the pump on my H100 is droning a bit.

I'll wait and see when Broadwell-e comes along. Not long hopefully.

 

[Yaayuh!]

Tempted just to go Broadwell-E. Money is burning a hole in my pocket though, it needs to hurry the hell up.