Looking for Zen replacement

[voodooridr]

I have a 32gb Zen I've been using for years and I've maxed out the storage on it so I'm looking for a new player that will hold more music(no need for video or radio). I need to be able to hit shuffle all tracks (or genre) and walk away.
I use the Zen at work and in the car for travel.
I picked up a FiiO M3 just to find out there's no way to shuffle all tracks so it doesn't fit my needs.
Anyone know of a good (sub $200) player out there with more than 32gb of headroom that will allow me to play all my music?
I should probably mention all my music is in WMA

Thanks
Dan