I think the 340SEs are a good suggestion, but then I am an Ascend owner (but not the 340SE, have Sierra-1s(NrT), 170SEs and 200SEs. I think it's a good sounding speaker and the value is good, customer service is quite good, David Fabrikant (owner/chief designer) and Dina in customer service have been great to deal with. I'd like to try the 340SEs but no justification at this time, but more likely next time I get something I'd be looking at their Horizons for front three, maybe the towers at L/R. You might check out a HSU package of sats with a sub if you liked the Klipsch, they're horn speakers but apparently not quite as bright as Klipsch. I'm not a fan of the horns generally. I'm thinking more about the new crop of planar tweeter speakers now. You might also look at theaudioinsider.com brands.
I'd still go at least 3.1 for better movies/tv, but that's me (I have or have had 2.0, 2.1, 2.2, 3.0, 5.0, 5.1, 7.1, 7.2, 7.3
). You can check my profile for my setups.
Haven't played with many speakers recently that would fit your particular needs but might suggest if you're a little bit handy to perhaps think about a SEOS flatpack kit from diysoundgroup.com as that just might get the nod over buying complete speakers on my next "upgrade" (despite being horns)
Either of the subs you mention are very nice for the price. If you wanted to, the Klipsch RW12d (I have one in a 5.1 setup) is a nice deal at 280 each, and you could get dual subs (which has advantages over one, if you've got the room). Might check out Outlaw subs, too at that price range. Or up your budget and look at maybe something from Power Sound Audio's b-stock.