Yes. The 1800X enjoys a comfortable lead over the i7-7700K in non-gaming workloads, but not a huge one. Intel is about to introduce 6-core processors with Coffee Lake and I would expect those to close that gap, and perhaps even overcome Ryzen.
AM4 is basically equivalent to the S115x platform. Next year, intel will still only offer 2 cores less than AMD is offering today. And Coffeelake isn't supposed to have any major improvements over Skylake and Kabylake, isn't it? Basically just another refinement on the energy efficiency and clock speed side (the latter being immediately consumed by the bump to 6 cores), right?
There will probably be Skylake-E SKUs with 8, 10, and perhaps 12 cores as well.
So I think AMD needs 12 cores to maintain Ryzen's edge, which shouldn't be difficult on a 14nm process that is already pretty mature now, let alone next year, especially when Ryzen is apparently something like 215mm². The other option would be for Pinnacle Ridge to have at least 10% higher IPC compared to Summit Ridge, slightly higher clock speeds, and fewer issues with its interconnect and memory subsystems. This is possible, but adding more cores would be easier, and not incompatible with any of this.
Alternatively, AMD could make relatively affordable—$1000?—versions of Naples with 16 cores, essentially offering something comparable to Intel's HEDT platform, but with much more raw power.
There is actually also Snowy Owl and its plattform which should have a smaller socket than the massive 4000+ pin LGA socket of Naples, if it is not the rumored HPC-APU with an MCM made out of 2 Zeppelin dies and a GPU. I would assume that there is also an MCM with just two Zeppelin dies. This should result in a quad channel memory interface and up to 64 PCIe lanes. It would be tailored to workstations and entry level servers and would be adaptable to the HEDT market in the same way as intel does with the LGA 2011/2066 platforms. That would be the natural opponent in my opinion if AMD decides to compete in the HEDT segment.
Both, intel and AMD offerings can be grouped in 3 different categories (intel may have more than a single socket for one category):
(i) 2 channel memory interface:
AMD Ryzen up to 8 cores
now Core i# with up to 4 cores, next year up to 6 cores with Coffeelake
(ii) 4 channel memory interface:
possibly Snowy Owl with up to 16 cores
now: HEDT Core i7 (Broadwell-E) up to 8/10 cores, Xeon up to 24 cores (Broadwell-EP/EX)
later this year: HEDT core i7 (Skylake-X) up to 10/12? cores, Xeon (Skylake-W) no idea
(iii) 8/6 channel memory interface
Naples with up to 32 cores and 8 channels
intel now: only Xeon Phi , later: Skylake-EP/EX on LGA 3647 with 6 memory channels and up to 28/32 cores