Try just using the Microsoft NVMe driver built into Windows. Just uninstall the Samsung driver and the Windows driver will load on the next boot. I haven't had an issue with Win 2016 and NVMe but I've only used the Intel NVMe and MS drivers.