try extending the timeout a different way, checking more frequently

Signed-off-by: Russell Senior <russell@personaltelco.net>