It all depends on Zen providing real competition to Skylake. I am skeptical. Even if zen is a killer chip, it will land is a sparse environment. AMD needs a win on CPU and chipset.
Most likely outcome: Zen is decent but not enough to make a dent in intel. At most it pushes Intel's prices down a little.
ARM is the real competitor to Intel not AMD.