Although it is not in the rules, I would have no problem with a 5 min. time frame before you can go back in. That gives the player some time to at least ponder the possibility that he is not far from being disqualified from the match. The player may also take that time to cool off, if needed.
Bigsby, what do you propose be done to "change the system"?