Hi KJawa,
What kinda of spending limit are you starting with? A 6d plus the 24-105 would make a good starting place but is quite a bit more than the 7d plus the 17-55 route. Should you wait for the 7dII? Na. Holidays are coming up and you might want to get a good price on a used/refurbished 7d by holding a couple weeks, but I wouldn't wait for something that prolly won't show up in a store anytime soon.