Dude, seriously. Go do research on Intel vs. AMD. I'm an AMD fanboy and even I know when to quit, and it's been time to quit for the last few years.
I would also take into account that Zen is dropping Q4 this year, so don't forget that as well. Intel might not be the go-to route for much longer, but that entirely depends on if Zen flops or not. But yes, wait and see would definitely be the way to go. If you're up for the 1070 pricing, do it. It'll be a great GPU.