Im not sure what you are looking to do, do you want to start over, what do you not like about your current setup? Do you not like how these sound with music?
How about just buying a nice 2.2 system for music, you can get a great system for around $2500 and keep you current set for HT, I enjoy having separate music and HT systems and would never go back.
You can get a pair of subs, a pair of really nice bookshelfs and a decent preamp and amp set up for $2500 and have a really nice critical music listening system.. If you are happy with your HT, I tend to take HT less serious than music, When Im watching movies and tv, the kids are running in and out my wife is answering the phone and cooking the dogs are snoring, ect so I couldn't critically listen to a movie if I wanted to, and I really wouldn't want to since its TV, not really much to it... But with music, I can shut the door behind me and disappear into a smokey hall with just me a glass of whiskey and Anita O'day singing Honeysuckle Rose 5 feet in front of me, you can hear her breaths between versus, the cello players hand slide the fingerboard, and her toe tapping off that old wood floor, the speakers are no where near the center of the room but she is, she's rite there the band not far behind her, depth so real you as long as your eyes are closed you can touch it..
BUT anyway, if you are passionate about music, build yourself a nice music only system, some may argue but there is nothing like a direct path simple music only stereo to take you away from where you are...
My uncle was always a musician and loved music, he's now 64 years old and finally retired, the first order of business was a music listening room in his house, the cleared out one of the kids rooms {they are long gone} and he bought some picture and posters for the walls, a used leather recliner from craigslist, a pair of Elan 30's {actually from music direct on demo sale}, an emotiva usp1 and upa200 amp with a record player and a cd player that he already owned, a small table to rest his drink and cigar on and he told me when I seen him on xmas eve that it was the best thing he ever did, and good thing he waited until he retired because he would have never went to work.... My entire family loves music, and I am like you I love it all, from Satchmo to Eminem I love it all {except this new Country / rap mix crap, can't stand that}