Well, after a bit of research last night, I ended up getting a HTC Hero.

I tell you what, I'm finding it hard to justify keeping my N900....might keep this Hero for myself, or get a different Android phone.

I've had a thorough play with it and it has passed all my criteria. The only thing that was difficult was getting yahoo mail to work, but we got there in the end.

The app store is amazing, coming from an OVI store background :P

The only major thing holding me back from definitely getting one for myself, is the keyboard. I hate onscreen virtual keyboards. They're just so slow compared to a dedicated one.