it depends on what you want to do with your pc.
you would definitely see some very nice gain in both game and productivity app.
personally i recommend getting the ryzen 3600 instead of 3600x, there are little difference between a oc 4.2 3600 vs oc 4.3 3600x.
as for graphic card, it depends on the game you run, a quick check will be using MSI afterburner and compare CPU and GPU usage, general rule is to replace the one with higher usage. so if GPU usage is high, replace GPU will net you more upgrade and vice versa, if both are about the same, i would suggest upgrade the CPU/MOBO/RAM as it will generally give you smoother game play