As per Luke's suggestion, turning this into a feature request -
It would be nice if Shuffle didn't get killed if I pick another song to play while its already in shuffle mode, or in other words I want to skip the song its decided to play but still shuffle and move on to the next song. In relation to this, when I click Shuffle, the Shuffle button doesn't visually change to show its been selected, This would also be useful to click again to Unshuffle.
If this can't be done, a Skip This Track button would be nice.
Hope this isn't too confusing - it confuses me when I read through it....