Yeah, I think it should be changed to a longer time limit. 5 minutes seems like a good time span. All the few-seconds-before-being-warped-to-the-admin-house rule does is create a little irritation before getting back to fighting.
But then again, a lot of people would get collected up in heaven, and the level would lag.
(Or is it levels? I've never been to heaven, so
)