Mac Pro upgrade advice

I currently have a Late 2013 Mac Pro with 64GB of RAM and ext RAID 0 drives for my media and sample libraries etc. I work in music, sound-design and film.

I am looking to upgrade to a new generation Mac Pro and since I have a limited budget I am carefully considering any areas that I should upgrade beyond the entry level machine. I am working with pretty hefty audio projects with orchestral libraries and a bunch of plug-ins as well as 96k/24 bit audio. In video I am working with 4K files and above and compositing and adding effects and grading + exporting high res files.

I am considering these upgrades beyond a new entry level Mac Pro:

48GB of RAM (or poss 64GB but could add later)

more powerful graphics card (16GB - mainly for video work)

4TB internal SSD - for my current Mac HD data and 'working media' folder.

Is my thinking on this upgrade sound? Is running my applications and all my plug-ins, audio and video files on one internal SSD the way to go or should I stick with an external RAID? I am trying to help reduce any current bottlenecks.

i am aware that there may be some pretty tasty Mac Pro's round the corner with Apple Silicon but when? I can wait a bit but not too long.

And, there is the iMac Pro... hmmmm

Thank you