Did you take a snapshot before performing the upgrade, and did you try to restore the previous snapshot before the reinstall?
Curious if snapshots can protect you even as far as OS upgrades gone wrong. I'd assume they can, if all filesystems are ZFS + snapshotted.