Ryzen 7 2700 or the X

This is absolutely correct.

Also, these days the "overclocking" is not as huge as it was 10-15 years ago. The gains are not that much, maybe a few frames during a CPU-heavy game. Most games are GPU-Heavy these days anyway.