Picking out a new sound system

[Orange]

Hey guys, so...im picking out a new system for my home and im looking to spend about 400 on a whole solution plus about 150 for the super t-amp if need be (sounds like i cant go wrong with that one). The setups that I found so far are as follows (Prices are a bit skewed because of a BB discount):

1) Klipsch RB-61 (pair, bookshelves) + RW10d (sub) = 379
2) Klipsch RF-82 (2x floorstands) = 400

so...the question is which set up is better for music? Having a pair of bookshelves plus a sub? or having 2 floorstanders. What do you guys think? Oh, and are those good deals at that price?