Whatever brand you lean toward, make sure of one thing, listen to the speakers before you buy them. And if possible (even better) listen to them in your own home, and return them if they don't knock your socks off as you listen to some music/movies with which you are intimately familiar. Many (good) av companies have 30 day risk free trial periods in which they will allow you to test out their gear in your home and return it if you're not happy.
When it comes to speakers, especially when it comes to speakers, I would not lay any hard earned cash down until you had listened to them. And then listened to them again and again.
Good luck in your upgrade quest!