Well I'm not sure if Intel will be releasing a new CPU anytime soon, but they will be releasing a new chipset, the Z390. The main advantage the Z390 has over the Z370 is it can accommodate an 8-core CPU. The Z370 can only support a 6-core. Then AMD should be releasing Zen+ soon. We're hearing March 2018, but it's just a refresh. The big change will be Zen2, but that won't get released until 2019.
If you can, I'd wait and see if Intel will be releasing some new CPU's soon. You'd think if they're releasing a new chipset, some new CPU's would follow. If they do, I'm not so sure it will include a hardware fix for meltdown and spectre, the two vunerabilities that are supposed to be patched now via Windows update, but of the two AMD is safer. Someone has to physically be at the computer to use those exploits, while with Intel, they can use them remotely.
I really wouldn't wait until Zen2 next year because there is always going to be new CPU's released every year, sometimes twice a year, but right now a new release is close, so it's worth waiting a few weeks to see what's going to drop. Who knows, Zen+ may have this massive increase in clock speed, which most games respond too and maybe it turns out to beat Intel in gaming. I have to admit, I've used Intel for a loooong time. The last AMD CPU I had was the Athlon XP 2500+. AMD CPU's were always great, but I always pick who's faster at gaming, since I'm a gamer and Intel has dominated for so long.
With a 1060,I think a CPU makes more of a difference. When you have a faster GPU like a 1070 or above, gaming at 1440P pretty much makes any modern processor run about the same. If you have a 1070, an i7 2600K runs the same framerate as an i7 8700k if you're using a resolution of 1440P or 4K. The GPU is the bottleneck in most games now. The lower the resolution though, the more the CPU matters.