You would be happy with either.
There is not a lot of difference in gaming.
With Skylake now available, there is absolutely no question in my mind that a new build should be Skylake.
a. Prices for cpu, z170 motherboard and ddr4 ram are almost precisely the same.
b. 6600K has an estimated 5-10% performance improvement per clock over haswell.
c. 14nm runs cooler, you get a decent overclock without the need for exotic cooling.
d. The Z170 chipset permits the use of much faster ssd devices on the horizon. Samsung 950 pro for example:
http://www.samsung.com/global/business/semiconductor/minisite/SSD/global/html/ssd950pro/overview.html
If your games tend to strategy, sims, mmo then you want the best possible single core performance.
I changed from a i7-4790Kat stock to a i5-6600K@4.8 and feel I did better in civ 5.
Here is what percent can get an overclock at a sane 1.40v
I5-6600K
4.9 3%
4.8 23%
4.7 44%
4.6 85%
Save the cost of the H100I and use the difference for something else. Perhaps a GTX980ti.
You will game better.