mobile phone upgrade

I'm on orange mobile network in the uk and have an upgrade due in a couple of weeks time, so as a dedicated tech lover i have been looking at the options available to me, now i love the idea of iphones and playing with my friends but i they're a tad overpriced and the camera's are't great, also they're exclusive to o2 here and I am currently on Orange. So I have been looking at what is available to me. i currently have a sony erricson 850i which i like a great deal, but I would like a smartphone which can deal with browsing the net easier and also support wi-fi. I aslo wanted a decent camera to take snapshots on the go, and for the purposes of this blog something with geo-mapping of images.

So i have cut down to two options;

1. HTC Touch Diamond 2
2. Samsung i8910 HD

I've looked at several review sites to try and whittle down my descision to the final choice; the samsung has a better camera and a oled screen but is based on a symbian system, which makes the touch sensitivity a little less sensitive. The HTC is based on windows mobile and is a little more adaptable and slick but the camera is less functional and has no flash :(

so my final descion, hpefully the samsung, but we'll have to see what orange say on the 4th...