I've gone from very similar,
Sony HTIB to Onkyo HTIB then to Onkyo with Klipsch 20s didn't like the treble on the Klipsch after very short time then found Axiom.
And haven't looked back since for speakers.