I wouldn't even know where to begin. With all that gear, it seems you should be able to work out some kind of combination of hardware that at least consolidates part of your requirements before adding yet more to it.
I started with older gear. First thing I did when getting back into this is researched what the consensus was with regard to what the actual quality was of what I owned already, the why's and why not's. Then came the work of actually spending some time with everything getting to know it and analyzing what I felt it was lacking.
2.1, to me personally, equates to more of a really good, near field type experience in the space where I spend most of my time. Anything beyond that ends up being rather superfluous comparatively. I'd end up with a lot of other gear that I didn't care as much about.
I guess what I am saying is, take that one favorite space, optimize that with what you have (or any combination thereof) and see if that's enough. Instead of trying to find a general solution for all at once.
A personal computer, a good AV receiver, a pair of good, powerful main speakers and a sub woofer should be able to knock your sox off or at least be a good start. If you're new to this, then you're going to have to teach yourself things about EQ, bass management and your system settings. You may already be sitting on gold there that has simply never been optimized.