Yes, I would totally go for 1TB at least for NVMe. FS takes a lot of space, so I would plan to have 500GB dedicated to it.