No, that pretty much covers all Android handsets except for the Nexus S. I would include the Nexus One but they've been promised Gingerbread weeks ago and they're still waiting. Your best bet would be to screw waiting around and just "Root" it.

As for the device choice with keyboard?? I immediately thought of the G2/Desire Z but I wasn't sold on the hinge of the keyboard and neither was my wife so she swiftly went for the Nexus S for her upgrade. I would stay away from anything Motorola (with a keyboard). My brother has had 5 (original) Droids and currently on his 2nd Droid 2. Not to mention the untimely updates from them as well.

Sorry I haven't been much help but as one of the posters said earlier, you're gonna be hard pressed to find everything on that "checklist". There's a million new devices coming out between now and April. You might find the right screen size/resolution of a device but no keyboard or hardly any on-board memory or storage....etc, etc. It goes on and on... The N900 is truly ONE of a kind. Do your research with this one and this one here to compare specs.

Also, as a sidenote you might want to see what Elop has to say tomorrow in regards to which direction they may be going. You might be getting another Nokia yet...