@mahgister I always enjoy your posts and find them insightful.
@skyscraper Congrats. It is hard for others to build your system because it depends on the type of sound you like and the music you listen to. Big money can be spent on a system that does not pair well with your music style or taste for sound profile. There is great advice in this thread. I would spend some on improving your room both the acoustics and just to make it a place you really enjoy being. I am fighting my room right now even though I have spent a good bit of money on components. My next spend will be on room treatment. Plus, for me, part of the enjoyment is being in a clean, comforting, relaxing space.
I would not start from scratch, but swap out a few things. I would also hold some money back for upgrades down the road to improve the sound or mix it up. I also encourage you to try streaming. It opens up such a vast amount of new tracks, again, part of the fun at least for me.
Good luck and keep us posted on your progress.