I would suggest to wait until RX 480 8GB available with custom fans rather than the reference one which should be around that price. If not MSI/XDX/ASUS.
Yup, the RX 480 is a good choice, and given the 4GBs are not an option atm the 8GB is the way you might have to go.
I suggest getting an aftermarket card such as the Powercolor Red Devil RX480 which just came out recently.
Much better cooling allowing for some nice overclocking if you're up for it.
You COULD go for the 1060 if you want that extra 5-10% performance, but the price difference is something for you to consider, as the RX480 is the best value of the two.
Here are the two main aftermarket coolers out atm.
Powercolor Red Devil 480: http://www.newegg.com/Product/Product.aspx?Item=N82E16814131694
Sapphire Nitro+: http://www.newegg.com/Product/Product.aspx?Item=N82E16814202223&cm_re=RX_480-_-14-202-223-_-Product