Stepping up to the next level ? HT and Music

A little about the system.
I have a Onkyo 5509 Pre pro , 2 Emotiva Xpr 2 amps bi amped powering Tyler Acoustics D1x speakers . 1 Tyler center channel speaker and 4 tower speakers for surrounds and back powered by a Rotel 5 channel amp . 2 Chase 18.2 subs powered by a Suntron M 600 amp. the room is 17 x17 and I can seal it off with a door .

No problems with the system for movies and no glaring problems for music . I would just like it to sound more musical but still run my subs at the same time .

I know music lovers say no to subs but I really like the layer they add to music . So what are my options ?
1. Add a pre amp for music ? But what about the subs ?
2. Better Pre pro like a Classe ssp 800 but loose room correction .

I have had a tube amp in the mix and really liked it . The sound wrapped around my speakers but was not loud enough when I wanted to turn it up . Also cant justify running tubes always when watching movies and tv and the associated heat that comes from them .

Im looking for suggestions that I may have overlooked or advice from those who have had similar problems .
Like I said , it sounds good but would like to take it to the next level musically . I mainly listen to cd,s but am looking at a music server and or computer audio . No vinyl at this time but may add at some time later .

Thanks , Lambeau