I like this. The factory-reset gate stops the attack without locking owners out, and the boot warning is basically what Android does with unlocked bootloaders.