I just want to clarify something. While Ryzen have many cores, most games won't utilize all the cores. Meaning you will not get the maximum performance out of the Ryzen CPU. However from the benchmarks, Ryzen did show more smoothness in the games, but Intel still tops out.
Honestly it's up to OP, but I'd stick with that I suggested.
I could elaborate if you guys want, but I don't feel like it atm.
OP if you still want to figure out what CPU you want, I suggest taking it over to LinusTechTips forum. Lot of techie people there like me over there lul
https://linustechtips.com/main/