I'm not quite sure I'd shell out for the 2TB of internal storage, as that is quite a premium. However, the 1TB option may well be what you need to provide the space you need and some extra room.
When it comes to ram, I'm inclined to say that you won't need to upgrade the ram for your uses, but you could add the bump to 24GB of ram and the 1TB of storage and still come in cheaper than adding the 2TB storage upgrade alone.
In your situation, I would be considering how much of the stuff on external drives you access regularly, determining how much space you need and migrating the core materials to external ssds. I'm sure you'll still be left with some stuff on spinning drives, but if you only need to access it occasionally, it won't be so bad.
When it comes to ram, I'm inclined to say that you won't need to upgrade the ram for your uses, but you could add the bump to 24GB of ram and the 1TB of storage and still come in cheaper than adding the 2TB storage upgrade alone.
In your situation, I would be considering how much of the stuff on external drives you access regularly, determining how much space you need and migrating the core materials to external ssds. I'm sure you'll still be left with some stuff on spinning drives, but if you only need to access it occasionally, it won't be so bad.