The hope is to upgrade the internal to 4TB because I have both OneDrive and Dropbox for cloud storage, and thus my 2TB C drive is near full. Plus, the USB port I use for my many XDD's and charging my phones needs replacement due to its advanced age.
I don't think I need to up the RAM to 32GB (2 x 16), since I don't do gaming. I still might later, just because.
I may have to also consider long term getting a new lapper, but not right now. Current one does the job pretty well, all considering.