I would suggest before spending any money you check your Windows for unwanted tasks running in the background. Windows is notorious for this. Open your task manger and look down the list and see what else is running, click the tab for Start-up, disable anything you don’t need on start-up. I have disabled about 6 items on this list, yours will be different depending on what programs you have installed.
Also when rendering or baking I have got into a habit of pausing windows updates and anti-virus scans and anything else that will slow down my pc and randomly start at the worst time.
As @me1958424 mentioned your specs are fairly good. You could spend a lot of money for little gain.
One more thing check your Blender. Under the render tab, scroll down to performance and ensure you have auto detect selected for threads mode under the threads drop down, and change the tile size for CPU or GPU rendering, I use 64 for CPU and 128 for GPU, there is a notable difference between 64 and 128 on GPU rendering. A larger tile size is optimal for GPU.
I believe the rendering process in Blender is due an upgrade, with all the recent investment from Nvidia and AMD.
Save your money for now.
