I have an older 4.1 set of Labtec speakers and it's time to upgrade.

Sound quality aside, what frustrates me about these speakers is that the volume control is on one of the front speakers meaning the speaker *must* be on the desk. I'd like to get something that allows me to better position the speakers off the desk and have a break out box or remote.
I was looking at the Creative DTT2500 but then the Logitech Z-560 caught my eye - mainly because the styling is a little more updated and the speaker stands also function as wall mounts. However, i'm not sure if it's wise to take the 4.1 Logitech's over the 5.1 Creatives!?! Any opinions?
I'm basically looking to use this system for music/games and maybe the odd movie while i'm working - I have a separate surround system in the livingroom for DVD's.
TIA.