When will I replace my iPod with my Smartphone?

With the increase in size of SD and MicroSD cards you can now store more and more music on your phone which is now makes it more competitive with the iPod. I would love to get rid of my iPod and just use my phone but here are my issues with doing that:

1. Battery Life - The biggest complaints I have with most Windows Mobile phones is the battery life. I can make it a full day on one charge. While traveling it becomes harder to stay on a charging schedule and I try not to use my phone unless absolutely necessary (email, phone, occasional webpages/rss). Nothing is worse than your phone dead on the road. (yeah I could carry a spare charged battery which I do have but I am bad about making sure it's charged).
2. Windows Media Player 10 Mobile - I don't mind it. It works well but is hard to create playlist and navigate files. It needs to be "mp3 player" like in usability. Hopefully with the future release of the iPhone MS will take note and come up with an application that can compete. I have looked at several 3rd party apps and have not found anything I liked.
3. Headphone Jack on the BlackJack - It's a proprietary jack. I like that my Motorola Q had a standard headset jack.

From the information and screenshots I have seen on "crossbow", the next update to Windows Mobile 5, I don't think there is going to be much of an upgrade. Let's hope "photon" will!

As side note; The one thing that I REALLY like is that I can sync and play songs I have from my Zune marketplace to my Windows Mobile phone. I like my Zune (yes I use both my iPod Nano and Zune) but it's cool I can take Zune music to my phone.