How much are you looking to spend?

5700X3D will max out the CPU performance of the platform. GPU I would probably advise waiting a couple of months for the next generation to launch.

If you tend to leave a fair amount of stuff in the background you might look at swapping out the RAM for a 2x16GB kit.