Maybe they could add a reservation queue to the bathroom as new functionality. That would probably be unnecessary blocking if people abandon their place in line.
The FIFO system does not take urgency into account. When making a query, it would be good to give an urgency rating on a scale of 0 to some_number.