Best Way to Upgrade Digital


I have over 3K CD's and I am building a new system & not sure what is the best way to set up my digital.  Should I get A DAC & CD Ripper or a CD/SACD?  I'm leaning towards a CD Ripper with a DAC, given the number of CD's I have it will make it easier to play them & store tehm.  I have an old Benchmark DAC1, should I use this with a ripper?  Or get a new DAC? Do I need to update my Benchmark DAC?  Or should I just get a CD/SACD?  Trying to keep cost under $1,200 if possible.  Technology is changing so rapidly, that I don't want to spend lots of $$ for something that may be absolete or wothless in a couple of years.  Any suggestions?? I do own a Blunode Streamer, sounds ok, hoping the CD's will sound better.   
nyrican
What are you using as a transport for your CDs now?  I continue to use a Benchmark dac1 pre and a Cambridge CD player as a transport.  Works well and sounds amazing.  Certainly you and I can spend a lot and improve, but we want to keep the cost low.  How many SACDs do you have?  Why don’t you know if CDs sound better than your streaming Bluenode?  I recommend you purchase a transport and listen to your Benchmark dac for a while and then decide whether to upgrade to a newer dac.   I primarily play vinyl.
Post removed 
Ripping as you go with a PC is the easiest way to organize and tag. Whatever method you decide on is best for you.  The only way that the files will sound "better" than the CDs is if you have a crappy CDP.
But the difference is not critical and maybe barely noticeable.