IMHO, jimewall gave the response that jives with me: if you need/want f/2.8, save up for the 16-35, otherwise the 17-40 is a very good lens for a FF body. For landscapes I usually stop down to f/8, unless light is at a premium and tripod is not available, so the 16-35 vs 17-40 will be a wash there (the extra mm won't be that noticeable, IMHO).
OTOH, your 650D 10-22 combo gives you pretty close to the same performance. I have to admit, there are times I wonder whether it was worth getting a 17-40 for my 5DII, when that other combo works seemingly just as well for almost all of my applications. Slightly better high-ISO performance is one edge to the 5DII, which can make up for aperture a bit.
If you find the 6D body is really performing that much better than your 650D, then indeed, go for a 17-40.
Look at it this way - if you buy either the 16-35 or 17-40 and don't really feel they are worth it, you can sell them for a high-percent of their purchase price. Or you could sell off your 10-22. Keep your 650D though, simply because bodies don't hold their value, and having a back-up could be very useful one day.
Again, IMHO, YMMV,
shinksma