Adjust enumeration timeout and device discovery strategy