Supposedly the firmware update 'fixes' the issue on the samsung, even so I'm not sure I'd risk it personally.
Honestly most Gen4 2-4TB ssd's, assuming they're rated the same '7000mb/s' range, are going to run so close to one another that you'll not be able to tell the difference outside of benchmarks. I'd try to make sure that it has a dram cache though.
The sn850x at £150 is a good price for 2TB drive with dram imo, so I'd probably just go with that.
I've had no issues with my 2TB firecuda 530s, bit more expensive than the WD though and no obvious difference in real world performance.