I'm a bit baffled that you waited for 5 hours for the re-entry permit, aren't you aware that you can apply at the airport on your way out?
That being said, when Big Jok(e) gets around to make his suggestions, I'd wish they do away with re-entry permits altogether and make them an integral part of every long-term extension. It's such a waste of time, hassle and passport pages for no good reason.