Flashed the bootloader, boot, system, and cache images manually and it appears to have updated ok. I'm on 5.1.1.
HOWEVER, upon finishing the first boot, I had a popup saying "There's an internal problem with your device. Contact your manufacturer for details." *sigh*