Always get a deluxe model and try to get one thats bundled! You can't upgrade the internal storage but you can have as many external hard drives as you want (up to 2tb/drive)
And those are good choices, also get WWHD if you havn't played yet!
PC Specs: CPU: 7800X3D || GPU: Strix 4090 || RAM: 32GB DDR5 6000 || Main SSD: WD 2TB SN850