get this instead of Samsung ssd, its TLC based NVME ssd with 5 years warranty so you get best of both worlds
https://www.onlyssd.com/buy/silicon-power-512gb-nvme-pcie-gen3-x4-m-2-2280-ssd-sp512gbp34a80m28/
I think there is some confusion here, when I said I swapped psu it means I tried with another psu which did not solved the problem so I don't have a faulty psu and I already have a good old corsair 80+ cx series psu.