Ryzen vs Intel I5 future proofing

I am in a predicament on what processor to buy for my first midrange pc. At the moment I have bought an I5 7500 which is a pretty solid non-overclocking cpu. I've heard and read that I should strongly consider the ryzen 5 1600, since it is overclockable, comes with a decent stock fan, and of course has 6 cores. I am a bit leaning towards the i5 since I've heard that coffee lake which will most likely outclass the ryzens with their own six core processor MIGHT support lga socket 1151. What would you do in my circumstance at this moment? I can still return the i5 7500, which I got for 190$(including tax). I plan to game(60 fps 1080p), browse, and occasionally photoshop