I also have the i5 2500K and just cancelled because of your post, and after doing a CPU comparison at CPUbenchmark.
The i5 2500K = CPUMark 6477
Ryzen 5 3400G = " 9957
Ryzen 5 3600 = " 20043... a huge performance jump and only $50USD more than the current 3400G.
https://www.cpubenchmark.net/compare/In ... 3498vs3481