Personally, I'd stay with the 5850. Most of the issues you mentionned above are pretty much a thing of the past.
Fermi worries me a lot concerning power consumption and I don't like the way Nvidia is going with their products. My 2 cents...
Assaulter beat me to it
