Not sure why this worked but, as a last resort, I used Odin to download the tar without the phone being in download mode. That brought it somewhat back to life (lots of errors as it was booting) so I got into recovery mode and did a factory wipe/restore and now everything is good.