Hopefully AMD can get the power down for Vega or Greenland and give Volta a fair match. It is quite a worry when you see the 480 uses more than the 1070 and performs substantially worse.
This is the main reason I'm really looking forward to seeing Doom/Vulkan optimised for NVidia. That outfit is one of the few I trust to get the most out of a card's capacity (if anyone can manage the best possible boost from Vulkan on NVidia it should be them), so I'd really like to compare performance/watt using that as a benchmark.
I would expect the 1060 to lose, as the 480 has more compute capacity (TFLOPS), but it needs to lose by a factor close to their TFLOP ratio.
Needless to say, if NVidia manages to outperform the 480 on that basis, it'd mean they're still way ahead of AMD, therefore Vega will require significant improvements to compete.