Lordbreeze

I'm thinking it'll be at least Q1 2018 until the next line of cards are even announced. So I wouldn't wait it out.
 
I'm a fan of the EVGA FTW3 1080ti, but it's up to you on which card you like more. Just be sure to check out benchmarks for thermals, performance, and noise before picking one.