I personally graduated from a Rpi3b to an Intel NUC years ago and never looked back. Real RAM slots and Storage options internally and you can get as nice a processor as your budget allows. So my vote is to move to the SFF PC and let your Pi stick around for other projects.