How about this: you can shuffle as much as you want, BUT shuffling doesn't reset the timer when you drew the first time.

This puts a limit on shuffles but prevents abuse and brings the risk of shuffling too much and losing the draw. They could shorten the card timers if needed.

Just a thought.