aftermarket designs will likely use an 8-pin power connector which should allow for the PCI-E slot to draw no more than 5.5 Amps.
From what I can tell, they haven't issued any fixes for the power draw, yet. That might fix it for AMD's own designs. A bit of a *censored* up that it managed to get past their own testing.
I won't be grabbing an RX480 either way, as I've already ordered a GTX 1070 just the other day, which should be a nice, direct upgrade for my 770.