Time to shop for a new phone

The N95 is getting a bit long in the tooth and I'm hunting around for a new phone. I'm certainly missing the HTC Advantage since I sold it and so am hoping to get a smart phone that will go some way to replacing it.

The short list at the moment is:

HTC Touch HD
Samsung Omnia
and a distant third:
Nokia N96.

I love the 5 megapixel camera on the N95 and haven't found a camera phone that can match it yet. Shooting a couple of pics in the same conditions to compare against the Omnia I found the N95 kicked it's butt. So the Omnia (good as it appears to be in so many ways) may be out of the running already.

The Samsung Pixon or the other 8 megapixel phones may be worth a look but they don't have Windows Mobile and that's a turn off.