I also am considering a upgrade and have been looking at same components so would be
interested for more expert opinions. I was using Scans premade DAWs to help spec out
the components with aim to construct myself, although I dont know how easy it is to setup
SSD disk caching etc