My suggestion is get the 7D now with a used 24-105mm f/4L IS USM. They are available for a great price on the used market, even though a lot are like new because of kit bundles.
Then use it as much as you can and figure out what you would like to shoot that you cannot with that combination.
You'll need or want a strobe(s) and memory card(s), maybe an extra battery on hand, case, tripod, filters, grip, etc., so the price beyond 'just' the body and lens can get quite high.