If you think Zen is going to be some wonder chip that destroys Intel in price/perf and will force them to lower their prices you got it wrong. If a Zen chip is the same performance as an Intel, you can guarantee it will be priced the same or higher even. Don't expect to get any wonderful deals, just buy an Intel CPU now. Even AMD's 40% increased IPC marketing is not enough to reach Intel's current levels.
If you think of it, GPU technology is increasing at a much faster rate than CPU technology. In general people would not recommend an I3 with a GTX 980, and seeing as the RX 480 should be close to a GTX 980, I'd recommend an I5. We may be reaching a point where, since our CPUs are not getting much faster, a better CPU may be wiser now with a mid-end GPU compared to what one would choose with a mid-end GPU from last year.