2 queues is the only real option. All other options only serve to punish the people who need a replacement or those who only want in progress groups. Have the 2 queues but allow people to queue for both if they choose. Win/Win