I did a build similar to what you want to do a while ago, though it is a bit of a lengthy post.
Honestly, I’d wait for the Zen 2 to drop. The 1000 and 2000 series stuff should drop in price significantly at the least if you do go for AMD, and the 3000 series is looking like it’s going to be a great chip