Your CPU is a huge bottleneck for GTX1080 at 1080p. The most you should buy is a GTX1070. Future proofing with a 1080 is a waste of time and money. You picked the worst time to buy a 1080 since NV is rumored to be launching 1080Ti around March 10th (PAX East). Sell the RX480 and get the cheapest open-air cooled (no blower) GTX1070. Later on, sell your processor and buy a used 6700K/7700K and then upgrade to Volta in 2018-2019. GTX1080 is also way overpriced for what you get. It's only 20-24% faster than the $380 1070. Not worth the $ unless you have top of the line CPU like 6700K @ 4.5Ghz:
https://www.techpowerup.com/reviews/ASUS/GTX_1050_Ti_Strix_OC/29.html
Honestly, your processor will even bottleneck the GTX1070. Modern games use 4-8 threads and your only have an i5. On top of that, when all 4 cores are loaded, your CPU only runs at 2.7Ghz!
New 7700K hits 5-5.2Ghz:
RX480 is not the only weak point of your system. You also aren't aware that some games you mentioned are unoptimized turds. Like turning on MSAA and HairWorks in the Witcher 3 will wipe the floor with your card.
Black Flag, as all modern Assassin's Creed games, is an unotimized pile of Anvil Next engine garbage. At 1080p, 780Ti and 290X drop to 43-44 fps with SMAA and to 35-39 fps with MSAA:
http://gamegpu.com/action-/-fps-/-tps/assassin-s-creed-4-black-flag-test-gpu.html
Your CPU is not fast enough to maintain 60 fps in Black Flag either (see CPU charts from the same link above).
You would be 10x better off building an 8-core Zen or 7700K/6800K overclocked system after reselling your mobo/CPU and getting a 1070 with the $ saved from buying a 1080. You would have a well-balanced system. If you buy a GTX1080, in 2 years that card is worth $300 max and you have a slow CPU platform. You are stuck on what to do. With my approach, you just sell the 1070 and get a new Volta x70 series card for $380-400. 2017 is a good year with Zen, Kaby Lake and the new X299 Skylake-X platform. Lots of great choices.
Around May-June AMD should release Vega and we may see Pascal 1170/1180 refreshes. Spending $550-600 on a 7+ months old 1080 is money wasted given your system's specs.
You are also memory bandwidth bottlenecked. DDR4-2400 isn't fast enough for Skylake. DDR4-3000 is minimum to alleviate the bottleneck of 6700K/7600K/7700K. In your case it doesn't matter since your CPU is slow but should you upgrade to faster CPUs, that RAM bottleneck will show up at 1080p when using a GPU as powerful as the 1080:
Hope you learned some things today :)
Your cheapest move is to sell the 480 and get a 1070. You can do the CPU/platform upgrade in the 2nd half of 2017.