Which phone to get?

[Guest loolah]

Hi, I have had a C500 since this time last year, and come out of my Orange contract in a week or two from now, and I'm wondering what phone & network will be the best deal etc, or even if it's the right time to change and whether or not I should wait a little while.

Things I like about the C500 are: Size, ability to check my gmail over the web, synchronising calendar & contacts with Outlook perfectly.

Things I wish were better:

The camera is easy to use but the quality sucks, so something with a much better camera would be very attractive.

I have a 512Mb Mini-SD to carry tunes around with me, but it's such a pain to use that I still carry my iRiver 256Mb player and use that instead, so something that makes that easier would be great, especially if it had a 'standard' headphone socket so that a converter isn't required.

Things I'd like in addition to the above:

802.11 so that I can Skype anywhere in the house & when I'm out.

That's it really, I guess my ideal phone would be a better 'C500', the same size, with WM5.0, that took SD or Mini-SD, had a better camera (ideally with an LED illuminator), and slicker MP3 playback (ideally with external transport buttons) with a standard headphone socket & WiFi.

Thing is, from the flurry of new HTC devices and all the varying levels of support from different carriers, I can't quite work out if my ideal device actually exists yet, so wonder if anyone can suggest a Smartphone or other device with those features available on a UK carrier? Of course, it goes without saying that it'd be perfect if it was available free from tarting my contract over to someone else :D

Oh GPS too. I'd like that as well. Wonder if any carriers are throwing that in for free?

Don't want much do I? :)