Phone/music issues

I like listening to music as I plod along, but am having a few issues of late.

For the last year, my w910i has seen me through - acting as a Walkman, and a lifeline in case I get attacked by wolves/killer herons/veloceraptors and need picking up.

It's now coming to the end of it's life as it only plays the one album it recognises, despite there being several on there.

Now I do like Jimmy Eat World, but listening to it a squillion times a week is getting a bit tedious and I don't want to end up hating it.

I've got a Creative Zen Stone thing, but I'm due an upgrade and want a phone that acts as music player too - any recommendations I should pester Vodaphone for?