No. Not worth the money for the slight downgrade. The 3700x trails the 10600k in anything gaming, or at best is equitable. It's biggest bonus last generation was its price + motherboard vs Intel 9700k +Z390, that's disappeared mostly with 10th Gen. The only real bonus left vs the 10600k is its cooling, you do not need a monster cooler to run good temps with the 3700x.
The 2080S is feeble. It's @ $200 more than the 2070S yet averages 5-10 fps @ 1440p more. Unless you are running a true 240Hz 1080p or 144Hz 1440p monitor and absolutely must have every last possible frame, then the step up from a 2070S is a 2080ti. The 2080S just isn't enough gain to be worth the extra price tag.
Air vs AIO is a seriously argumentative debate, that seems to be never ending. But it boils down to lack of understanding.
In their respective ranges Air = AIO. A 140w 120mm Corsair H60 has exactly the same cooling potential, and happens to have exactly the same cooling performance as a CoolerMaster Hyper212 Evo. Noctua NH-D15 is 250w, same as beQuiet Darkrock Pro 4, same as most every 240mm AIO. Same cooling potential. The differences in temps are due to the design, efficiency of the particular heat exchanger and fan/s. But thats where big air stops.
Any bigger on the heatsink and it wouldn't fit in enough cases to be worth producing, how many cases have 180mm+ worth of clearance from panel-cpu. Socket location is a physical limitation, you literally cannot put a cooler bigger than a D15 in a case, it can already hit the gpu, ram, top of some cases.
But you can squeeze a 300w 280mm AIO in most cases, or even a 350w 360mm AIO in many ATX cases lately. Far more capacity than Big Air can bring to the table.
At 229w Stock Intel power limits for 56 seconds, or even with some MSI or Gigabyte motherboards a higher stock bios power limit and unlimited duration turbo, Big Air is in trouble.
Aircoolers only bring bang for the buck once. The day you buy it. After that it's a moot point. Either it'll do the job and be worth the money spent, or not. AIO's might cost more for the component, but come with 2-3 free fans, and some RGB/ARGB fans worth buying can cost upwards of $30 each. So many times, AIO initial cost is offset by case fan required purchases.
Honestly, Build #1 is better balanced and has better quality components. Squeezing in that Deepcool 5 pack just to squeeze in a 2080S which with the 3700x will net @ the same fps as the 10600k/2070S, yet cost $200 more, isn't the best use of your money.