So I've dumped the N97 again, this time in favour of the Samsung Galaxy S and I think in time the S PRO with it's Qwerty Keyboard will be the next upgrade.
So far no major issues with the Galaxy, I managed to transfer 300 texts over with a few conversion routines I snaffled from the web. I used my memory card for the pics and a sync with outlook for the contacts. One of the best features is the rSAP support in the bluetooth, this really suprised me for an Android based phone, but it works great with my Q7.
Onboard 8GB SD card and an additional 32GB slot is plenty of memory. Phone is quick, apps are plentiful and the upgrade to Android 2.2 is imminent.