All I have to say is: Love the phone you're in!
The way I see it, I was more than happy to drop 150 plus a 2 yr agreement for my Captivate, and I don't regret it at all. You have to remember that whatever you get, it's going to be "obsolete" in six month's time anyway. And if the new hardware is good enough next year, I'll pay for the early termination or the early upgrade with a smile and get my new toy.