I recon that it will be at least six months before you will be able to buy an AMD Zen, and by then Kaby Lake is already out from Intel.
There is always new hardware on the horizon.
If I were to buy a new motherboard and CPU now, I would also buy new DDR4 memory. Otherwise you could be bottlenecked by your memory speed in some circumstances.