When it finished, I skipped the flash-and-reboot step, and now it boots fine. I have no idea how "clean" my file system is, and the obsessive-compulsive part of me wants very badly to retry the process from the beginning, but I'm afraid I'll never be able to get it to boot again. So I'll stick with what I have now unless/until I run into issues.