Shuffle should randomly play unwatched episodes first before watched episodes

I watch several shows like American Dad or Family Guy in shuffle mode. However, when I watch in shuffle mode, I seem to get several of the same episodes over and over yet unwatched episodes are rarely getting played, possibly because there are so many episodes. I think the proper order for shuffle should be:

  1. Randomly play episodes from the list unwatched episodes until there are no more unwatched episodes then go to number 2
  2. Randomly play episodes but flag them so they do not play in shuffle mode again then go to number 3
  3. If all episodes have been watched and have played in shuffle mode, go to number 2 above