should I upgrade/replace speakers?

I have a set of Logitech X-620 speakers. They are working but the supply LED in the main speaker does not light up when it's on. Also, I think one speaker out of the bunch is not working but I usually don't have all going in the 6.1 configuration (kinda hard to get one rear speaker behind me).

I was wondering if I should get a new set. I was thinking of a 2.1 setup for room and price. However, these speakers would be used for both movies and music but especially movies. Should I opt for 5.1 or 2.1?

I could just keep what I have but I'm thinking the sound quality is rather weak but maybe something 'broke' or weakened as these speakers are somewhat old. Also, the LED light never coming on is a concern and one wonders if there are other issues going on.

I was thinking of a budget of $40 as I can get any of these for that price:

Logitech (970285) X-240 2.1 Speaker System (Retail Box) - $40

Altec Lansing VS2421 Multimedia 2.1 Speaker System (Retail Box) - $40

Logitech (970118) Z-2300 2.1 Speaker System - 200W RMS - THX-Certified – (Refurbished)- $85

Logitech (970223) X-540 5.1 Speaker System - Black – (Retail) - $40

I added the Z-2300 in there as it seems it's often recommended. Could someone recommend some speakers and comment on what I have currently. Another potential issue is the subwoofer i currently have. The sound quality seems somewhat weak and the volume seems weak as well. If I turn it up, it has okay volume but the subwoofer seems to produce too much bass and just drowns out the speakers' sound, it seems. I read a review on these speakers before and it seems to confirm what the subwoofer does (regarding bass).

Anyway, I'm mostly considering new speakers since I can find decent deals and I would like to know whether there would be an improvement. Is it worth the price to find out?