Due to lack of time I just went with systemrescuecd (Gentoo-based), it has nvme-cli 1.3 on it.
Did a few reboots, but still no joy with it.
I'll try to get it running on a few different systems, we have at least 4 different models of Samsung and they all can go into ERRORMODE, so plenty to...