A budget option might be too look okay the ryzen 7 1700x. You get more threads. It is slightly slower in single core performance, but should still do well. Plus, you can overclock it, just like you can do with the 2600. They run about the same price I think as well.
I personally have a ryzen 1600, my friend had upgraded this year from a ryzen 1700x to a 2700x and he just sold me his 1700x for 75, hard to pass on. But my 1600, with a small overclock, has been pretty decent. Really it would have probably been fine stock, but hey free performance lol.
If all you are doing is gaming, Intel is better. No question. If you are multitasking, streaming, Photoshop, just lots of simultaneous tasks, the ryzen is better imo. Plus, more games are starting to take advantage of multiple threads. So in a couple of years, the i5 may be a minimum.