It really depends on what you are looking for and how big your listening space is going to be. What didn't you like about your music listening experience before?

I'm also assuming that for you, the bass wasn't a problem. If that's the case, the Encore subs will probably be fine with the M22. However, I had an Energy S8.1 and replaced it with an EP500. It was a huge improvement for HT.