6D VS. 5D Mark II - upgrade dilemma.

We all knew this great day would come. Manufacturers finally selling full-frame DSLRs at the 2K price point. In a year from now, these cameras will be a little below 2K. I bought a 5DII in June 2011 and really like it. Since I'm mainly a landscape and travel photographer, I am not bothered by the AF shortcomings of the 5DII. I am more concerned with image quality and it shines there. I guess unless you really need better auto-focus, I would keep shooting with the 5DII and wait for some tests to come in on the 6D. It will not be available for a while anyways. I'm sure the AF of the 6D will be better than the 5DII. There will be a slight sacrifice on build quality, but again, unless you are tough on equipment, it's a non-issue. I think the wi-fi and GPS in the 6D are nice, but again, not a necessity for me. Plus, my next upgrade will have it anyways maybe in a 6DII...