Is Intel going to blow AMD out of the water in the next generation of CPUs?

I myself am an Intel user primarily because I mainly just play games, but I am excited for AMD's relatively new Ryzen and Threadripper CPU's because not only are they very good for people who need more cores, but they also challenge Intel and have forced them to actually get moving again. Now, Intel's knee-jerk response to Ryzen and Threadripper with their i9's and i7 extremes has been disappointing so far, and I doubt many dedicated enthusiasts who know what they're doing will choose them over Ryzen or Threadripper. However, once Intel gets their shit together in say, the next 2-3 years, will they once again blow AMD out of the water with a properly handled release? I mean, I get that Ryzen and Threadripper are a huge success for AMD, but is it enough to keep them in the game long enough where Intel's massively higher revenue isn't just gonna leave them in the dust? I sincerely hope it doesn't because competition between these two companies can only mean good news to us builders.