As someone, like many here, who have gone through the various ways of listening to music from my first Sears 3-in-1 stereo system I got from Santa at age 8 to a rack system in college to a striped back system of a receiver and CD player to purely streaming for years (starting with low-quality MP3s ripped and traded with friends) while DJing in grad school, until now. As a middle-aged gGen Xer, I never really got rid of my vinyl and CDs through all my listening stages of life,
I would recommend not going with the either/or approach. Keep the vinyl rig and the streaming rig. I still buy music in digital, CD and vinyl format. And enjoy listening to all 3 formats all the time. Sometimes to compare sources, sometimes for critical/purposeful listening and as wallpaper for around-the-house activities.
Enjoy both for what they offer. I've made the decision that for some artists I want to collect, I choose a format. For example, I'm a big New Pornographers fan and have albums in all 3 formats but the digital copies were never great. So I choose to reinvest in getting their catalog all in vinyl. Every album came w/ a digital download so I have copies for streaming convenience. For other artists, they may only be in the digital or CD format domain so I go that route.
I won't make recommendations on gear because my price range and needs are very different from yours and others on here. Some with deeper knowledge and experience in niche/boutique brands I'm only now hearing about. But I will say, don't paint yourself into one corner or the other. Be a music-first audiophile! And enjoy your collection on the vinyl and streaming set up you have. Don't limit your experiences. Variety is the spice of life!