I've had 300D, 400D, 40D, 50D, 7D, and recently bought a 6D. I really, really like the 7D; it is clearly superior to all the xxD bodies I've owned, and it is a fantastic outdoor camera for sports, nature, wildlife and so on. On the other hand, the FF 6D outperforms the 7D in IQ, low-light, and iso noise. The 7D has a superior AF system, but to me that just means it is my go-to for the activities listed above. For indoor shooting, city- and landscapes, portraits, and other instances where any movement is relatively predictable I expect I'll use the 6D. You mentioned iso 800 or 1600 (?); try very useable 25000 with the 6D! I mean seriously. I'm still learning this body's capabilities, but when I shoot with auto-iso at night the body doesn't hesitate to go there and produce great images that are almost completely useable out of the camera. If iq is your main concern, there is no contest. Keep in mind that the newer crop-frames will provide better iq than your 400D, but again, they will not match up to the iq of the 6D. The 6D's AF system requires a bit more diligent patience but your effort will be rewarded with greater dynamic range and all the other things I've already mentioned. If you decide to stay with crop frames, you might wait and check out the 70D which rumor has it will be released soon, or even just wait a while longer and check out the 7D II which is supposed to come along later this year. For a wider angle on a crop frame I would seriously consider a 17-55 f/2.8 IS. It yields fantastic iq, provides some wide angle. However, it is a 1000. lens not offered in a kit. Seems we are back to simply buying the 6D 24-105 kit...