Ok, in that case any 5.1 computer speaker setup will do of the two you mentionned.
I was thinking more along the lines of buying an A/V amp and two speakers, so you can build on that, incorporating new speakers when you have the cash / feel like it.
For 400 dollars I'm thinking you could get your hands on a decent Yamaha Amp and some low cost Bookshelves...
It's not that Bose are bad, it's that they're not necessairly good, especially for the price. Other alternatives will offer MUCH better sound for less.
Bose is great for style, but in terms of ability, they suffer against some speakers half their price...
If you don't feel like building over time and want 5.1 now, I'd go Klipsch.
Here is something I DON'T like though:
6 analog discrete channels (3 stereo miniplugs), Auxiliary stereo miniplug music input
The Logitechs' are more future-proof as they have an optical input... so they can actually be used if you had a standalone DVD player.
So I guess I have to change my suggestion to Logitech. Klipsch might sound better, but analog is WAY to limited for future use.