Samsung Moment or Samsung intercept?

These are the two phones that I can afford to upgrade to. As far as I can tell, the moment surfs the internet faster, has a much better screen, and has a camera flash. The intercept is basically inferior except for the android 2.2 uprgrade, and a sleeker physical design. I've read as much as I could about these phones and I still can't decide. The moment seems to be the better phone right now, but once the intercept upgrades to an android 2.2, well, will that be enough to make the intercept bett

Read more here ...