You mention the battery problem of the N95, but this has been greatly improved with one of the recent firmware updates. If you haven't already done so, you might want to upgrade your firmware.
I was expecting battery problems before buying my N95 8Gb, but I must say I am very pleasantly suprised. (The battery of the 8Gb version is a bit bigger though.) Although I usually plug in the device while sleeping, I have never run out of battery power, or even seen the battery indicatitor at a low level...
