You are totally right, investing in Intel now is only smart to buy Intel Hades Caynuon NUC8i7 Barebone with i7 and AMD Vega inside 120W
and install SATA III SSD 1TB, NVMe 1TB and 2x8 GB 2666MHz Vengenace DDR4 SO-DIMM.

Even he is good because AMD Radeon RX Vega M GH.

If anyone want custom RIG I suggest to wait. I mean it's not urgently for most people so much to buy AMD for any cost. But if computer die to someone, then situation is different.
It's hard to ignore advantage of AMD.
They will present some EPYC now crazy fast, Intel no way to catch them.
No more excuses, on 4K monitor R9-3900X and RTX2080 or Navi or Vega II fps is almost identical as Intel.
On same frequency as Intel i9-9900K, AMD R9 3900X could be faster 15% easy.
If Intel 6 core boost on 4GHz and AMD 6 core boost on 4GHz winner is AMD.
Price of cooling, deliding, not worth 3% better fps because much higher boost frequency on i9-9900K.
Problem is because for me, without +500MHz OC over Intel Turbo Boost, for all cores, it's not interesting.