Agreed.
Strictly for gaming got i5 8400 like 2 years ago,1st gen Ryzen was already launched and I went Intel based on poor r5 1600 gaming benchmarks.Back then people were hoping that games will soon become even more multicore friendly and such multithreaders like r5 1600 will beat Intel's 6 core coffeelake cpus in no time.To this day this baby beats r5 1600 AND r5 2600 in most new games and still has what it takes to compete with r5 3600 in some games.Of course if you're going for productivity AMD is a no brainer,there's no doubt.I will wait for new stuff to come out,like ddr5,by that time AM4 will be absolete,new,more powerful CPUs from both camps will be out.Future proofing is dumb IMO,new stuff is always around the corner,get what you need now and be done with it.
Games have already gotten more multicore friendly. The 1600 is beating the 7600K now, even if not a match for your 8400. The 2600 is barely behind your chip and can beat it with a good overclock. Did you even pair a 1080ti with your 8400 and run it at low res so it could show off those higher average framerates? Or are you running a midrange card so you are really just the same at gaming and lower everywhere else than the Ryzens?