To throw something else into the pot, what about the Sony-Ericsson Xperia X3? SE will be announcing it tomorrow here:
http://www.sonyericsson.com/whatsnext/
Sony Ericsson has been able to turn out some really sexy looking phones (Satio, Aino) lately so I have high hopes for the X3. It is the only phone coming out soon that will make me cancel my Nokia N900 pre-order.
I am trying to figure out if it it has a keyboard or not. I can't tell from the teaser video. Any quesses?