I voted "Keep the N900"... from what you've listed above, all are sexy kit; however the N900 you already own, it works great and it's definitely a great device.

And besides... give you enough time to wait to see what Samsung does with their Galaxy S series as well as what HTC does with their phones.