3900X vs 5900X

My current studio workstation:

Ryzen 3200G 

Asus X570-P

32GB G Skill 3200 CL16

GTX 1650

WD SN850 500GB

WD SN850 2TB

I initially put this computer together back in March on the first day of Covid lockdowns with the intention of upgrading when Ampere/RDNA2 and Zen 3 released. 

Well it's been 3 months and stock is non-existent on all of that and I'm debating options. Just like everyone on here, work is slower than usual, so the immediate need for the upgrade isn't as pressing as it would have been if my work life in 2020 was similar to 2019's, but this 3200G is still noticeably slower than the 3600 I have at home. 

I can pick up a 3900X today for MSRP and enjoy an enormous benefit over my lowly 3200G. But I got an X570 board to use the new stuff.

Is the performance delta in C1 enough to justify waiting till spring for stock to normalize?