There's no point of hoping that AMD (alone) will magically improve their gaming performance with Zen 2. The point of Zen in the first place was to abolish Intel's fast but (industrially) inefficient intercore topology. It has to rely on the developers to improve performance. In fact, Zen+'s IPC is at least as good as Skylake already, in apps where AMD's intercore topology is utilized properly. Also recall how Skylake X is much worse than Intel's mainstream parts. I'm certain that IPC and core clock is going to get better with Zen 2 (I estimate 15-25% cumulatively). But even if their 6 core Zen 2 part will have the same IPC as Coffee Lake and runs at 5.0 GHz, they will not achieve gaming performance parity.
I see that AMD will tweak their next gen CPU depending on how good this 7nm process is. If power consumption per transistor is around about 1.3-1.7x better, I think they should opt for 6 core per CCX. Anything less than that I probably will expect them to keep the core count. Anything more than that then the 8 core per CCX option will be likely. The thing is we are not sure on that yet.