1600 is a better long term choice.
I made the same choice and went with 1600 and am happy. Why?
I use lightroom/ photoshop a LOT and its very much faster during video and photo exports.
Also I play mmorpg's where I am quite often running an entire group of 6 chars by myself so I needed atleast 6 cores.
Could I do that with intel? Yes but it started to lag after 4 clients due to quad core earlier.
Am I happy with my upgrade/ sidegrade? Yes.
Your mileage and needs may vary. It's all about how you're going to use it and no one can answer that but you. You need single core performance or multiple cores.
Power consumption wise I'm quite surprised the Ryzen scales awesomely. Outside of benchmarks (where I've hit 91 watts), I've never hit 51 watts and that's exactly the same I used to get with Intel earlier.