Actually, have you tried a Hijack kernel in this setup yet?

Hijack DOES do the detection slightly differently, and might work fine as-is. Otherwise, perhaps I'll tweak the timeout slightly for you (and everyone else will also have to suffer with it..).

-ml