N950!!! If you love n900 you need meego and qwerty no android, no symbian, no ios, no 100‰ touchscreen
Why not do what I'm considering, keep the N900 and get the E7? The N900 is still pretty usable even without a sim card in it. You got the Wi-Fi, Bluetooth, IRDA and FM transmitter for starters. With more internal memory than the E7 the N900 could be used to back up data.