The Ryzen build will give you more performance no doubt, but in my book it's still a bit too early to tell if AMD really has something good going for them. It won't hurt to get it, but I know Intel's chip will lat for a long time. Also, not sure about NZXT power supply. As much as I love the company, they are more of an accessory type and not a main component type. And $89 for that? You can get something of much better quality for cheaper or the same price. Also, I would go with the RX 580 4GB of the 1060 simply as it's bit more powerful. At the end of the day, any of the two will work just fine, so now it's up to you and which drivers you want to install, who has the better warranty.
That's just my three cents.