AF option 3 was the deal-breaker for me... just ordered a $2599 5D2 kit from amazon instead.
While the lack of improved AF was the deal-breaker, the added gizmos (wifi/gps) meant that the body couldn't be full magnesium or as weatherproof, and the camera is generally crippled worse as compared to the 5D2 (lower shutter max speed/sync/durability was the one that really stood out for me).
As somebody that's more interested in core features and ruggedness, versus gadgets, the 5D2 kit was too good to pass up at $300 cheaper, with no waiting. Had I wanted to spend more than I did, I would have saved my pennies for a 5D3 instead.
As somebody else has said on here, it's pure Canon marketing/strategy genius... the 6D will draw in beginners from the Rebel line who love the added gadgetry and promise of FF heaven, while the enthusiast-level people on the fence will be pushed upwards to the 5D3, especially after the remaining 5D2s are sold out.