I ended up getting the Icon's, and I love them! They are super-clear compared to the Sony's that I had, and they actually keep up in overall frequency range despite the Sony's having much larger drivers. As far as the direction that I am headed with this setup? I think I am simply going to stick with the Icon-W series, eventually replacing the Onkyo surrounds with the Icon-W surrounds, and probably investing in a new subwoofer at some point. Not sure if that will be Klipsch or not, I will have to do some research. I'm not sure if I should replace the receiver. It came with a HTIB, but it seems to be pretty nice. I will probably end up replacing it at some point one way or another.
Those are my thoughts for now... As far as the future goes, I have no idea. I may end up saving for the Klipsch Reference series at some point, or go with some other brand, like Bowers & Wilkins, but this is looking far into the future, when I hope I will have a little more than the money I'm making now.