Well it is now confirmed that the 6D has 11 point AF with only one cross type point.
So you'll be using the old focus and recompose technique, no matter which camera you pick.
If I were you, I'd abandon ship and go for the D600. Looks like a much much better camera.
I i didn't had so many Canon glass i had dropped the ship few months ago when 5D3 was announced and go for D800.