Unless you can get a decent deal on the current gen cards, I would wait. The expected launch is within 1-2 months and availibility should improve with the launch.
You recommend to leave 1080 and 1080 ti? or Sell them now cuz this is only way i getting currently money from tho