I agree that unless you need the system within the next couple weeks, you should probably wait a bit to see what the Ryzen 3000 CPUs have to offer. It sounds like they will likely provide around 15% more performance per clock than the current models, in addition to them clocking a bit higher.
I wouldn't consider a Cryorig H7 if you are in the US, as they don't seem to be distributed here anymore. The only places still selling them have the prices of their remaining stock marked up to absurd levels. The original H7 was a good value when it was priced under $40. The H7 Quad Lumi offered a bit better performance, but at $60 it could arguably be considered a bit less of a value. At significantly higher prices than that, they are not really worth considering though, as there are better-performing options available in that price range.
And you almost certainly won't need an 850 watt power supply. An RTX 2070 draws less than 200 watts under load, and a Ryzen 2700X shouldn't draw much more than 100 watts with all cores loaded, so you likely won't have more than 400 watts being drawn by all components with both the CPU and GPU under full load. Switching to something like an RTX 2080 might add another 50 watts or so, and it's possible that AMD's upcoming processors could potentially draw a bit more power at higher clocks, but a good 650-750 watt PSU should be plenty to handle those components, and it's possible to find high-quality units like the one Finstar linked to for far less than the price of that 850 watt unit.
Also, I would pass on a 1TB hard drive in favor of either putting the money toward a larger SSD, or a getting a larger hard drive if you need the bulk storage. The cost-per-gigabyte of 1TB hard drives is not particularly good, and it's possible to get a 2TB drive with double the capacity for not much more.