Changing it due to upgraditis

- also, I've dropped it as well which necessitated replacing the screen. That's fine but now it doesn't turn off when you put it to your ear so I'm forever pressing mute with my cheek. Other than that I do like it but I'd prefer something with a better camera for when I'm out on my bike. I'd also still like to be able to access the internet. Apps are great so the ability to add them would be good (I know nothing comes close to the app store but hey ho).
If it wasn't for the sensor not working I'd probably wait for the next Apple product - the 3GS isn't enough of an upgrade really to tie myself into another contract, especially with the handset price/
So, ideally,
Good camera
Internet
GPS would be handy (but I don't want to have to pay, this may sway me to an android phone I guess for Google turn-by-turn)
Not fussed about it being touch screen but a good screen would be nice.
edit: just seen the HTC HD2 - looks amazing but obviously, being a Mac person I'm a little put off by Windows Mobile. Will it play nice with my Mac?