I have a T1i a 7D, and recently purchased a used 1Ds mk 2. The image quality of the 8 year old 1Ds easily outshines the 7D. If you're expecting to shoot portraits, landscapes, and other non-fast motion things, I'd wait for the 6D.

If you're expecting to shoot wildlife, the crop sensor of the 7D can help save money vs. longer lenses.

If you're expecting to shoot fast-moving sports, you'll need to wait for reviews of the 6D to find out if it's AI Servo performance is track motion acceptably, and if it's burst rate is acceptably fast.

If you go with the 7D, I'd recommend the 17-55 over the 24-105 easily. It's a stop faster, and you WILL miss the 17-23mm range.

If you need the camera now, but really want the 6D, you can always buy a used or refurb rebel (or a cheap used 5D mk 1) to use while you wait.