Looking for a recommendation for redoing my current setup

I don’t think there are any CPU / motherboard improvements to be had. I mentioned the ‘replacement MBs’ that servethehome did articles on in a different thread. More expensive replacements more trade offs for NAS use.