I was just about to post the last night I did a factory reset, and retried the firmware update. It took, and everything was working fine.
So, anyone reading this down the road, do a factory reset in the Android settings, update everything again, and you'll be good.