If you want a hard disk player in the short term and if you don't want the current Riot then you probably need an iPod. If you can wait then I'm sure there will be iPod-beaters around in the mid-term.

Rob