If all you need (or feel you need) is a better-sounding CC speaker, I'd replace just that and not your entire set-up. If gently-used interests you, I'd check canuckaudiomart.com (or your local Kijiji) for something like a:
- Studio CC v2;
- Studio CC-470 v3; or
- Studio CC-590 v4 or v5.