Note that this behavior (switch to dev mode, reboot) is needed to run factory install shims.  

So we'd only want to fix this for normal recovery images.  The delay should only be used if dev mode is enabled via the TPM, and not if it's set via GBB (indicating someone already modified or could modify RO firmware) or if soft WP is not enabled (ditto).