AMD and Intel both have their strengths. Budget will always be a limiting factor, but your apps will also dictate whether you should focus on cores or core speeds. And don’t forget about power draw and thermals.
AMD's Ryzen 5 2600X offers marginal improvements over the 1600X - which might not sound like a vote of confidence, but the fact of the matter is that the 1600X was very good and the 2600X is even better. The most impressive feature is the way that Precision Boost 2 pushes clock speeds close to the limits of the CPU - without any user intervention. This means you get enhanced performance out of the box, but with minimal effort.