You are doing what I just did. I had 17 year old - oh, I can't say it! The SHAME of it all!
I moved up to Klipsch. OMG! The difference is amazing! All my music sounds new. And even TV is better, clearer. The sub is a major addition, too. I found 12" subs to be noticeably better than 10".
Suggestions: Don't buy from an unauthorized dealer, which will cut out most if not all online sellers. Rip offs seem to be common. Klipsch has an online system where you can find authorized dealers, and you can call and talk to a person to inquire, also. I did. "Mr. Too Good To Be True" was just that- too good to be true.
I found the "in-wall" and "in-ceiling" speakers to be inferior. Most were horrible. If you want flat, go with Magnepans.
I bought from a local dealer and I don't regret the cost. I can move up to more expensive speakers within a year and get full credit for my old (current) purchase toward the new. Visit local dealers with YOUR music/movies and listen. If you can't get to hear them before purchase- don't buy them. Some speakers look so strange you wonder if they were designed for music or looks- and in what decor would they fit? Remember WAF. Get her in on the decision, with her listening to HER stuff.
I assume you are going 5.1 or 7.1. Seriously consider Denon receivers. A new one comes out in July. You might want HDMI switching capability.
Read the Klipsch interview at the top of this forum- the only sticky.