I always thought a 7-bag where you reset the bag when nearly empty was a good compromise (where "nearly" can be selected for how much randomness you want).

Droughts are technically not prevented, but odds of them do go down quite a bit.