Upgrading your cooler isn't going to do much either if that's the case.
I undervolted my CPU with Ryzen Master and got better temperatures and more consistent performance.
The MSI Crosshair 16 HX AI D2XW ticks a lot of checkmarks, especially if you can snag it on sale. It features an excellent ...