I am trying one last reformat, not partitioning a drive into two parts, and upgrading slowly. Hopefully then it will work.

if not, time for serious looking.