The software upgrades appear to have fixed the 5D Mark II problems so I ordered one. It arrives Tuesday along with the battery pack. Adorama only had bodies in stock for one day last weekend, otherwise I would still be waiting.
I've decided to keep my 1.6X crop body though. Any lens on that camera is immediately a 60% telephoto. For example, my 70-200 becomes a 320 and with a 1.4X converter I get 448mm. Beats buying a 400mm lens. Also there are a few places I go where I would not take a more expensive camera.
I was tempted to buy a used Canon EOS 1Ds Mark II (16.7 MP) instead of the New 5D Mark II though. It's a heck of a camera and now selling for less than $2500. Problem with these used bodies from Adoroma ....we don't know the shutter count, only the physical condition, so it's risky.