if you don't want to overclock, from those two the ryzen probably is the best option, more cores and threads do help on most cases
i5 could be a bit better on some games but not by much and the ryzen can overclock itself abit so you don't have to do it, the i5 will not be oveclokcable
on both platforms you will be able to replace the cpu with newer and faster cpus, on amd side you will have more years of new cpus than on intel, new cpus for this socket lga 1151 could very well end this year or the next, amd am4 socket will live until year 2021 or 2022