Get a replacement N900 as long as they're out there!
There will be no other phone that can replace the N900 within the next 5-10 years.
The only player on the market that would create a similar but updated phone like the N900 is Openmoko. But they don't have the resources to actually do that.