New mp3 player?

[sweh]

I've got one of the old Archos Jukebox 20s. It's a pretty normal mp3 player; it plays mp3s!

Unfortunately it's 4 years old, and so it has some limitations:
1) It's big
2) It's heavy
3) It only has 20Gb disk (my mp3 collection is over 33Gb - all music I own; ripped from CD)
4) Battery life isn't too good.

I've replaced the original batteries with higher power ones and replaced the firmware with Rockbox, which helps extend battery life, but the first three problems are still there.

I also have one of those USB flash-memory mp3 players with 128Mb RAM and which can take MMC cards. However that machine has plenty of usability problems :-(

So I've been thinking of getting a new hard disk based mp3 player. Minimum 40Gb, so I can have my complete collection on it (at 20Gb I've found myself wanting to listen to a CD that I don't have loaded). And small and light. And works with Linux.

The last point ruled out the iPod...until I found out that people have got iPods to work with Linux! (Worse; people have ported Linux to the iPod!!!). However the iPod 40Gb doesn't seem to exist any more and the iPod 60Gb photo version is pretty expensive.

The Creative Lab Zen Xtra looks large and heavy in comparison to the iPod. The Zen Touch looks a little better and has 24 hour battery life, but it's still larger than the iPod.

Then there's the iRiver devices...

Or are all of these really too big for a shirt pocket? Should I just stick with what I've got? Hmmm...

*ponder*