Personally, I think the 30min penalty is to harsh as it is.

If I wanted anything extended, it be the queue popped timer. Sometimes 45 seconds just isn't enough. The number of times had to use the rest room and then sprint across the hallway with my pants down just cause I heard the queue noise.