I thought about grabbing a Ryzen 2600x, mobo, and 32 GB of DDR4 yesterday at newegg (~$445), but I didn't, as I don't know what the upgrade would really do, relative to my i5 6600k (which is also slightly oc'd). I think multicore would be greatly improved, but the rest would likely be a wash, and then I remembered, if anything, I'm jonesing for a new camera.
I'd just consider the i7 version of whatever your mobo would support. On a much older platform I've been quite happy with my 3770k upgrade. Though it does just about nothing at the desktop. Helps in some gaming and the occasional video.