I own the 7D and love it, but I have to ask: why do you want a new body?
You won't see any difference in image quality as they both use the same sensor. So, the reasons to upgrade would be because you want or need some of the other features (improved autofocus, faster frame rate, weathersealing, etc.) Study the specs and see if you need those features.
You really don't need to worry about a new version being released anytime soon. I just don't see a new 7D in the works until sometime next year (I'm predicting around the time of the Photokina show in the fall).
Personally, I'd recommend you consider a new lens (you can never have too many). I have the exact same lenses that you have and you made very good choices with them. What you are missing is a telephoto zoom. You might want to consider one of the many 70-300 mm zooms out there. At the lower end, I'd strongly recommend the Tamron 70-300 mm stabilized zoom. It's sharp and well-built and less expensive than the Canon 70-300 mm IS zoom (and reportedly beats out the Canon on sharpness as well).
If you want to spend a lot, there is always the new "L" 70-300, but personally I think it's a bit overpriced. If you want to go cheap, but sharp, the 55-250mm Canon IS EF-S is an excellent value. (it rivals the 50mm f1.8 as the best bargain lens Canon makes) You could consider a 70-200 f4 "L" IS which is frequently available from Canon's online refurbished store if you are in the U.S.
Alternatively, consider the 100 mm Macro IS f2.8 "L." It's very sharp and can serve as a short telephoto in addition to being a macro.
Just some thoughts. If you decide to buy the 7D you won't regret it, but since you are sharing three lenses between the two of you, I'd recommend more glass.