Gtx 1060 Or To Wait For Rx480

So the question is fairly simple. I have a budget rig consisting of an i3 6100, 8GB RAM, SSD, and a 600 Watt PSU (a branded one). I bought the rig back in May and decided to wait for the dust to settle with the release of the new gen GPUs.
Now I have somewhat difficult choice. A GTX 1060 which I can get immediately - MSI GeForce GTX 1060 GAMING there is a 3GB variant as well and it is almost $100 AUD cheaper. Or an RX480 Sapphire Nitro + also available in 4G/8G variants, but not right now. As it stands I would have to wait a couple of weeks to get one.

My question here is, since I've waited long enough without a proper graphics card, I am eager to get one ASAP. But, the RX seems to work better in DX12 titles and as I'll spend most of my time playing new Deus EX (which still hasn't got DX12 enabled) it seems as a right choice. However, that is just one game.
Overall the 1060, seems to me, comes on top by few percent and if there won't be too much DX12 games coming our way in the next year or so, then I'd go with the 1060.

What do you think I should do? I've spent the last week searching around and exploring, only to find myself in an even bigger dilemma than when I started.

 

Wait for the RX480 8GB, it'll pull further ahead of the 4GB and the 1060 (forget the 3GB version) with time, the drivers will improve further as more DX12 games are released.

'branded' doesn't necessarily mean quality.

What screen resolution will you be gaming at?

 

When I said branded I meant quality branded like SS, Silverstone, Corsair, Antec, etc. In this particular case it is Antec VP600P.

My monitor is 1080p.

 

Doesn't read like the Antec brand has much faith in it:

"This entry-level solution gives you everything you need in a power supply. No twinkly lights or glittery paint jobs - a 120 mm fan for effective and quiet cooling, dual +12V rails for amazingly stable power and heavy-duty protection circuitry for peace of mind, no matter how demanding your system. And it comes with all the assurance of Antec's AQ2 Antec Quality 2 year limited warranty."