All of this is dealing only with a single PC and no hardware changes at all. Acronis was my tool of choice for cloning, but this issue has beaten Acronis
Doing another clone run with Reflect and will report back as soon as it finishes and gets a test run.