Allegedly, Francois Piednol really wanted Intel to do just that. Years ago. He was rebuffed. There's this thing called Rocket Lake coming up but uh . . . when, we don't know. And we don't know if it's Sunny Cove or if it's even meant to compete with Matisse.
1). Either one will be a massive upgrade over your current daily driver! That being said, the 3600 may actually OC better, making it potentially a better gaming/ST chip. 3700x is probably the worst-binned chip of all the launch-day Matisse SKUs. It should still do pretty well. 3600 might hit 4.8-5.0 GHz while 3700x may be stuck at 4.7 GHz. Just guessing here, but still. If you are okay with 4.5 GHz or lower on either chip, actually the 3700x would be the better buy . . . if it's in your budget.
2). Which motherboard are you looking to use here? Unless you are going for a bleeding-edge OC on a 3700x, I doubt the cooler will matter much. You will not get a great HSF with either the 3600 or 3700x since both are specced for only 65W coolers. 140mm doesn't give you much wiggle room either. Have you considered an AiO instead? EVGA CLC 280 isn't that expensive, it'll give you lots of cooling overhead, and it will probably fit the Cerberus if you're willing to be flexible about where you put the rad:
https://www.sliger.com/products/cases/cerberus/
What's your budget?
Or consider posting this in the Ryzen 3000 builders thread.