Yes, I think this could help. I think I would prefer the version were you remove characters from the queue. To me it seems to fit more the current playstyle of your game.
