I recently upgraded to the 5800X3D, and based on my experience I strongly recommend you give "PBO2 Tuner" a try. This is a neat little freeware app that allows you to apply negative Curve Optimizer (CO) settings to the CPU.
In my case, and as also documented by someone else here --
https://www.reddit.com/r/overclocking/comments/uigbv7
-- applying negative CO settings significantly reduced temps while also slightly improving performance on Cinebench 23. I suggest you start with -30 on every core, then test (OCCT is great for this) and reduce the negative numbers for any cores that throw errors. I wound up with -30 on 5 of the 8 cores, -20 on my two best cores (per Ryzen Master) and -25 on one other core.
I'm using a good 240 AIO, but my CPU temperature would still shoot right up to 83C while running CB23 multicore. After the PBO2 Tuner adjustment, it maxes out at 78C while delivering a score of 14,8XX vs 14,6XX previously. Max VCORE during the test is about 1.17V instead of 1.26V. More importantly, when running MSFS 2020 at 1440P UW (3840x1600) on high/ultra settings for extended periods, my CPU settles in the mid 70s instead of low 80s, with similarly reduced CPU voltage and no reduction in FPS.
Please note: The only downside here is that you'll need to redo the PBO2 Tuner settings every time the PC restarts or wakes from sleep. Minor PITA but worth it for now. Eventually I'm sure there will be a BIOS update that allows negative (and only negative) curve optimization or at least some form of undervolting. I was hoping MSI's AGESA1.2.0.7 might offer this, but I guess it doesn't.... so I'm sticking with 1.2.0.6c for now.