I eventually solved it by hard resetting, not restoring from backup, doing all of the updates (for phone and apps), installing for the fast ring of windows preview, then I set my phone by one of the AC vents to ensure it stayed cool (it would get really hot in my other attempts). It worked on the first try.