iPod/iPhone Wishlist

I'm debating whether or not to get a new iPhone and where I stand with iPods. Ever since the iPhone came out, there's no reason to get an iPod. The iPhone is like an iPod with phone capabilities. I have my cellphone and my iPod at all times with me, so it's best to just combine the two. But there are still some issues before I make the jump. There are also some capabilities that I wish to be added to the iPhone, for it to be the perfect product:

Online Radio

Satellite Radio

Custom Ringtones

Expanded selection for Ringtones [At least from the artists I want]