On the second option you could replace the cap with per-customer fair queueing to end up with a work-conserving system. It's not clear what the resulting performance would be, though.