Probably Kabylake, although I'm a bit suspicious about Zen. RX480 was promising a lot and the GTX1060 is still a better option, sometimes even cheaper (Gigabyte G1). I've been a long time AMD fan and I'm slowly shifting to the blue/green team. Cooler, better power efficiency, better single core performance.
I'm sure Zen will massively improve AMD's currents state on the CPU market but and will as always dominate in the low/mid range market, but for high end I highly doubt AMD will ever beat the i5 series (not to mention i7).
Remember, this is coming from a longtime AMD fan.