Personally I would wait.
Wait to see if/when the iphone comes off of AT&T. If it does, see if it lands somewhere with better Android phones. Unless you want the Backflip in which case, your problem is solved in a couple of weeks.
AT&T said 1st half of 2010 customers would see 5 android phones. We know what 2 of them are already. Right now we