For the most part, I'd probably go with Intel. However, I've heard nothing but good things about AMD's Ryzen. They've supposedly done an awesome job with it.
Yeah supposedly Ryzen is the way to go for pretty much everything now. Their single core performance isn't up to par with intel but if you do anything other than game then more cores is better. That being said intel have retaliated with coffee lake which was sort of a half assed approach to ryzen. Either way now that theiere is competition in the market there's no real wrong choise. I have a 7600k in my PC because at the time ryzen wasn't out, but i'd honestly probably go with ryzen at this point. also it seems it makes the install just a tiny bit easier but thats just imo.