For music and HT suggest looking at the Kef R700s assuming twin subs or if you have room R900s. I know there are many great speakers but I feel Kef does music and HT both very well. They are also starting to hit on all cylinders again with the Blades, R series and LS50s.
For the money you will be hard pressed to beat the R series but I know there are other great options also. If you can, audition as many as you are able to. You certainly have a great Reference to go from.
Main Kef: Reference 205/2 & 202/2c, Surrounds: Kef XQ40, Velodyne Optimum 12, Integra DHC 80.3, Ayre K-5xeMP, Oppo BDP-103, Bryston 4Bsst2, Parasound Halo A31. Second B&W: 685 (3), CCM618, Def Tech Powerfield 1500, Onkyo TX-NR1008, Zone 2 Klipsch AW650.