If it were me, I’d start from scratch just to be absolutely sure. I’m no expert though. It would just nag at me the whole time that something is going to go wrong if I didn’t redo the whole thing.

Regarding the M.2 drive, I can’t give advice. I’ve only dealt with them once or twice when installing and they worked like any other drive. Nothing funny when shutting down or rebooting.