Decided to say screw it and picked up a 5800x (its what's in stock...), Asus ROG X570, 32GB of 3600 ram and a 1TB PCIe 4 NVMe...
Its a beast, even without screwing with the clocks (boost clocks stay pegged at max with 360mm AIO for ages), but now my 6 month old 2070 super is the bottleneck... and the circle of life continues.