Implemented a similar fix.
Though I think the bot should be waiting already if you didn't set the reconnect delay to 0. If it is set to 0 my fix won't help in this case either as I'm using the same timeout.
PS: I've added the fix to the official main bebot svn. Not sure what's the status on the aoc svn is.