upgrade now, if you keep waiting for other new tech to come out, you will never upgrade. the 4000 series is still long away, and the Ryzen 9 3900 will be a huge upgrade for you. Go get it, and enjoy the ryzen side. (This is coming from an intel guy for the last 20 years)....
**EDIT** also keep in mind, ryzen 4000 series will be a drop in upgrade as it will be am4 also... so that makes this choice even easier. Get a quality x570 board
**Intel System** Asus Z390E Strix / 8700k @ 4.85Ghz / 32GB BDie @ 3200 CL14 / PowerColor 5700XT / eVGA 850w PSU / Sammy 960 EVO m.2 / MX500 250gb games SSD / 49" Samsung UltraWide 144Hz
**AMD System** Asus ROG Crosshair VIII Hero / 3950X @ 4.580GHz (CCD0) 4.380GHz (CCD1) 1.350v/ 64GB DJR Mem @ 3740MHz CL16 / 2080 Ti / eVGA 1200 Plat PSU / Sabrent 1Tb PCIe4.0 m.2 / MX500 500gb games SSD / 34" LG UltraWide 144Hz
(Dual watercooling loops for CPU and GPU, all highend)