But another issue - usually the new high-end phones gets released with ******ed bugs still remaining.

The N900 still have quite a number of huge goofs. But Nokias next offering will need quite some time until it reaches the same level - under the assumption that Nokia doesn't decide to drop the support for that phone too...

So if you are going to use the same phone full time for many years, the upcomming Nokia models may be a better choice. But for now, it is very hard to know when the new phone gets available and even harder to know when it gets available with the required maintainance release of the software.