About the OC. I'm not too sure on the scenario today but it depends on what is available on the market at the time. For example I also have a i5 (3570K) and you have to remember, when that processor was new it was quite THE processor to have for a gaming setup. Now 5-6 years later I am still able to play most games but do encounter a bottleneck on the CPU. Overclocking the CPU evens out the bottleneck a fair but with my latest GPU. The OC capability of this particular CPU probably saved me a year more.Ok, so I'm from Hungary. Country is on the expensive end of computer parts due to ridiculous VAT and other stuff. But it is what it is. My budget is limited, although I'm quite lucky as I'm still willing to pay a lot (compared to the avg. wages here at least). The reason behind the stronger GPU is that most tests and people say it is better to invest into a GPU rather than a processor. For example in my currency, i5 and Ryzen 5 are all roughly 75-80k, i7 and Ryzen 7 are 110-120k. That 40k makes the difference between a 2070s and (almost) a 2080S.
Another thing is that most people believe that 6 cores without HT will be insufficient later on - and I'm planning to hold my ground for at least 3-4 years before another major investment (maybe another 16GB Ram midtime, if I feel the urge). Therefore Intel's i5-9600K is almost out of the picture. Ryzen 5 however is not.
Although I am fairly sure that there's no real bad decision in this case, but I still want to be as objective as I can and if there are more arguments next to AMD then I am maybe willing to change. It's going to be a completely new rig after all (minus the storages).
Lastly, I can't really make up my mind on OC-ing. It just might not be my way of handling things. If all AMD comes pre-OC then it is for the better since I might not even invest into a K processor and a pricy Z370 motherboard...I just think that if I need to OC to get the framerates then the need for a new setup is around the corner anyways, so it would only likely to affect the last year of that rig.
But this answer now looks like as if it was me conviencing myself to buy an AMD