Ryzen 2700 is good, but don't get the 2700x, do the Overclock yourself (basic difference between the two, although the 2700x has a little better quality to it, not worth the price).
If this upgrade is coming slowly, AMD is looking looking to release it's ryzen 3rd Gen possibly in Q1 of 2019, so that's something to keep an eye out on.
Are you Purely gaming? Or do you also do editing work of sorts? Planning on streaming?