I just wanted to confirm what you're saying about intel over amd for the time being. I started out not having a certain choice and about 8 years ago got into working on computers professionally. I have spent several years in a shop working desktop and laptops stuff, a couple years doing servers and networks and 3 or 4 more doing everything. My most recent machine, the one I'm running right now, is running an AMD A10 7850K which is in my opinion a fine processor but I chose it for a certain reason.
I wanted to build a tiny gaming rig that had the best onboard GPU currently on the market and so I purchased this processor for that reason. I ended up not building my NES computer (would have been awesome) and got into star citizen, now my mini board with that CPU is in a big full size case to accommodate my R9 390 8g video card. With that much power I'm not having any issues running star citizen but for how much I spent on this rig I better not have a problem. With that being said if I could start from scratch and build a rig that's NOT meant to be inside of a gutted out NES console I would have went with a full size board, a new gforce 1080 and an intel i5 CPU.
Although it used to be necessary or better to run an AMD cpu with a Radeon card that issue was fixed over 5 years ago, it hasn't been a relevant issue in a long time and it won't be coming back. It's not true that you get "more power" from a radeon being in an AMD machine anymore except for a few core features that are so insignificant they shouldn't even mention them.
The fact of the matter is at the time that I'm typing this the best GPU's on the planet (don't waste your money on anything else please god) are the new GForce 1060, 1070, 1080's and NOTHING comes close to their level of power. i'm not saying that as a fan boy or anything, I'm not, it's just the truth. Math doesn't lie! And some people will say "well only by 20% der der" and you know what, ignore those people because 20% is 20% when you're paying almost the same price. if you believe the other way how about you send me $20 paypal and I'll send it back with 20% less and it's a great deal!
My advice? Keep your current rig, buy the new EVGA 1070 and rock away my friend! Anything else is either a waste of money or overall loss of power unless you can go bigger and spring for the 1080. Also, if you just "wait" and buy a card then you'll never get one, there is ALWAYS going to be a better one right over the horizon, it's the law of how these things work. Get what you can while you can and don't regret it later, enjoy it while it's hot and in 5 years replace it when you can't play the new games you want to play.
You have an Intel, I recommend Nvidia. If you had AMD, I would recommend AMD (I just think those combos work better)
Bias alert: I am an Nvidia and Intel user and have been since the Riva TNT2 card and my first 286. I am not an AMD/ATI fan, so maybe someone with more favorable attitude towards AMD would put in their copper heatsink's worth.
Get the best video you can for the money. PC gamer seems to think that the Nvidia 1060 is the best bang for the buck and the 1070 slightly better, but is more expensive. Both of these should be under 500
If you are open to AMD, then check out the AMD R9 Fury X. It supposedly has the best benchmarks out there for an AMD card and those are around 500 USD.