I would advise you not to get a intel PC right now, it looks like they are changing sockets once again soon, which means what you might buy now, might not have upgrade path in the future.
AM4 is pretty sure to be around for a while and has more cores which means the Ryzen might work better in...