Don't get another 6800GT. I don't think they even sell those anymore. Perhaps they do, but who knows.
AM2 isn't so great, yet. It only boasts a 3-5% performance increase, so I would wait until they come out with quad-core to do something with your money. Then again, I'm not you, but that's just my advice.