Hey guys, I'm choosing between getting a motherboard upgrade, from a Z97 core i5 4690k, to a X99 or Z170 (Considering that RAM also has to be upgraded)

This because I'd like more CPU power to use in Unreal Engine, some Java programs (Doing Ackermann's models, fractals and simulations which take a high amount of operations) , gaming and video editing.

So, what chipset would you think it's more adequate? what motherboard do you think it's the best?

Current PC specs:

Processor: Core 15 4690k (3.8 Ghz Current Speed)
CPU Cooler: Cooler Master Hyper D92 (37° idle, 60° 100% load)
Motherboard: EVGA Z97 Stinger Wifi
Ram: 16gb Corsair Vengeance
Video: Nvidia GTX 970 MSI 4G
Power Supply: Corsair RM 650W