Yes I would recommend the Klipsh I think. I've got the z5500 and while I'm still glad I have them, the ported-10"-sub-driven-by-only-187-watts was a _bad_ decision.
Fortunately it took me about a year to finally distinguish why something just didn't sound right about my music.
Basically, everything in my logitechs can be EQ'd up/down except for the crossover between the sub and the satellites. The sub continues pumping well past 120hz, into ~165hz where it finally drops out; so anything in the 100-165hz range you're mostly going to hear (or not) from the sub. Deep voices, the "kick" part of a beat, etc. With respect to music, the sub is a little underpowered for 10" and only 187 watts; so the "kick" you hear is less a sharp beat and more a slightly delayed, slightly muddied thump.
Logitechs are great gaming and home theater systems (the voice issue really isn't a big one) but if you're much interested in a quality music listening experience and enjoy any sort of rock whatsoever, don't get them.
Hence I say the Klipsch. (In the home theater range the Klipsh 5.1 setup's sub is a dual 6" driver. Less uber deep base, but much more accurate and much better for music listening).
edit: I would recommend you forgo the initial cost and spend the money on the 5.1 Klipsh, or the $4-500 Onkyo 7.1 reciever+speakers deal (you have to look for this one but it's worth it). With either of these, we're talking about a system that's good for 95% of the population's music listening needs, and (assuming it doesn't break, which it shouldn't) would be good for life. Basically, a good investment.
But you know what they say, a good investment now will be a good investment later; and seeing as the range you're looking at buying is only $100, its not like the $100 is exactly wasted. So in short, get whatever you want; but if you want something you won't feel like you need/want to upgrade, get the 5.1 Klipsh.