Where would you spend $$$...new CPU or a GPU water block?

Have you checked around for other peoples OC success with your specific mobo with the 5800X and the 5800x3D? That might answer your cpu question on the $300. The performance gains may not justify it.

If you just built the PC, maybe sell the CPU to recoup the cost of the 5800X3D. Tuff position.