I'd suggest a completely new roulette that will put you into a duty with your role chosen at random.

Make this roulette unlocks after you have all three roles unlocked, and goodbye queues
Or, to be less drastic, let the duty finder queue for multiple roles.