should i get the gtx 1060 or rx 480 if i upgrade to win 10

I'd recommend the GTX 1060 over the 480 for the games you plan to play - the 6 GB version if you can afford it as there is a handful of dx11 games that can push over 3 GB.