This is going to be a bigger deal than I thought. Can’t cross 91% lib scan even if I delete the music lib and then upgrade. Even turning on debug logging doesn’t reveal anything helpful. Rolling back to 10.10 for now. Will attempt again when they force me to upgrade.