I have a Canon 40D - time to upgrade for better IQ, reduced noise, but have limited budget. Thinking 6D, but I really like my Canon 10-22 wide angle. Can't afford new body and new pricey lens. I have Canon 24-70 L and love it, so definitely want to keep it. But I am mourning the idea of losing a wider angle option. The 16-35 Canon is way out of my price range - even the Canon 17-40 is a huge chunk. Suggestions, please? I hear hints of an new 7D version coming out in a couple of months- any inside info on that?