I liked the Air Motion speakers but I think that Klipsch would be fine for your application as well. The Monoprice Monolith THX subs are bound to be higher performing than the Klipsch subs though, but of course they are more expensive, but skip Klipsch's subwoofers if you can. In a $2k budget you should look at RBH's new Impression speakers and also Hsu Research speakers and subwoofers.
I would be wary of Onkyo receivers, especially refurbished ones. Instead, I would be looking at Denon, Marantz, or Yamaha.