i'll have a look at the droid 2 - looks fantastic but afaik it doesnt come with 32 gigs. though i dont want to buy a new device already.

i thought of going back to samsung, but they dont have a proper device with a hardwarekeyboard.

maybe the meego-device will be nice too, but after the n900 i'm really not sure if i'm taking that risk again anytime soon.