I think the IPC gap will become an interesting battle in the near future, especially as gains that came from aggressive speculation have proven to introduce security holes (take your pick of Meltdown, Spectre variant n,...).
https://www.anandtech.com/show/12625/amd-second-generation-r...
BTW We're looking at ~4200 for Ryzen, ~4800 Ryzen 2, and ~5800 for i7 Coffee Lake.