I ended up getting a Ryzen 2700x. Can take it back for up to 2 years, we'll see how this goes haha. I figured 8 cores + hyperthreading would be useful for building Chromium, and for most of the games I play it overclocks to within 15% of the i7-9700.
Here's the benchmark scores:
https://www.userbenchmark.com/UserRun/16035724
Overall I'm happy with it so far! Windows is actually.. kinda refreshing? I'm going to dualboot Pop!OS too.