I'd get the 3700X, which will make choosing to upgrade in a mere 2 years time optional...
If we knew for certain that X570 boards will work with Ryzen 4000 desktop CPUs, then perhaps a 3600 would do nicely, and it could be replaced in a years time with an 8c/16t model once their prices drop 8-12 months afterward...