New Body?

I've been looking at purchasing a complementary/replacement body for my 40D. It has been a bit on the fritz lately, and I'm looking for an excuse to get a new one.
I've identified my two biggest frustrations with my 40D - the AF system, and noise. So far as I can tell, the 50D isn't an option I want to bother with. The 5Dmkii with the FF seems to be the solution to my noise complaints, plus take advantage of the 24-70 f/2.8 in my non-aviation stuff. The upcoming 7D seems like the better AF system, by a fairly measurable difference (plus approx 8fps vs 5D's approx 4fps). So ultimately this turns into a 5Dmkii vs 7D debate. Any thoughts - anyone use the 5D?
Or I could say screw the body and go for the 70-200 f/2.8 IS... :borat:
Anyways, anyone have any thoughts - or any experiences with the new 5D?