xtb21

I'm gonna buy a new system. Would like some imput on this. I'm sold on klipsch. Should I go with rb 25, rc 25 and rs 25 with a rsw 10 or go with rb 35 and rc 35 and will rs 25 go with them and a rw 10 sub. Was wondering whether to up grade speakers and stay with rw 10 or upgrade sub to rsw 10 Thanks