Should I upgrade from 40D to 6D?

Hi there

Today I went into a photo store and tried out the 6D. It felt great in my hands. Ligther than my 40D. I love the GPS and WIFI, and I am thrilled about the IQ and high ISO perfomance.

I am a bit concerned about the AF. The periferial AF points hunted quite a lote and sometimes wouldent focus. The center point was ok, but not very fast. in addition, all the focus points are placed tightly in the center of the VF.

If the 6D had my 40Ds autofocus system I would not doubt buying a 6D. The 5DIII is too expensive, heavier and lacks wifi and gps. I dont want a 7D. I want FF. I own a 24-105 f4IS and 70-200 f4IS, so I'm sticking to Canon - so no D600.

Should I upgrade from 40D til 6D or wait for Canons next "cheap" FF DSLR?

Cheers

Rune