Those are both good. If you can get by with the 1tb drive for now, then I would suggest the memory. It's easier to add a drive later. Another m2. The spinning drive is realistically only going to be for backup, etc. Anything you want to edit with should be on the m2. You might consider an external drive (USB3) for the spinner and put another SSD in there. I configured my current computer with 2 m2s. From my previous rig that had 2 SSDs. Then first time on the new machine I went to backup from one drive to the other... I saw the confilict, I didn't really want to backup to an m2. So, I went and got a 1tb ssd for secondary files and my nightly backups, and I already had a wd NAS and large WD Usb drives for longer term backups.