Pretty sure my next one will be Nokia, hopefully Maemo, if Nokia doesn't totally botch this up, which I doubt.

What other choices are there anyway?

iPhone is way too closed and the hardware is far from bleeding edge. Apple might surprise this summer, but I think it is more likely they want to continue to rake in profits.

Android I could consider, but it feels kind of "fake open" and somehow my mind repels the thought of "Java == mobile efficiency".