Don't bother with Intel, they are still stuck with Skylake architecture, it will take them time before they make something substantially better and fixed of their endless issues. 6000-9000 Intel is all the same on Dekstop for the most part. Who knows when they will move away from the "Lakes" finally.
The price/performance for Intel parts is often abysmal when AMD has a competitive product as they do now. Easily pay +50% or more for +10% performance, so not worth it. At low end products can be more competitive but the high end from Intel is nuts price wise.
Zen2 3000 series is what I would get. If you can't wait till then, well 2700X is a beast.