Yep, go with an Onkyo...hands down. I had a Yamaha with 5 speakers and a subwoofer, I had to upgrade my receiver for 3D pass through, and I went with an Onkyo. It made every speaker I had, and my amp, sound so much better.
I think I'll probably stay with Onkyo for receivers from now on, they're that good. I'd go with them for a HtiB, from what I hear even their entry-level HTiB's are better than a lot of mid-level build-your-own home theater sets.