No, I'm not waiting around for the iPhone. I'll stick to the tried-and-true "avoid first-generation Apple products" rule. Something cheaper and improved will be out in a year.
It was contract renewal time, so I picked up an LG VX-9900. Pretty sweet so far. I use BitPIM to manage ringtones, photos, and contact info. Plus, it has a nice ringtone maker built right in.