Glen
If you like the sound of the system, then go with it. Your ears should be the judge, although the enviroment you listen to them in can have an effect on the sound. if you didn't get to audition the items at home, I hope the demo room was reasonably similar.
Factors such as polished floors without rugs and a lack of curtains can change the sound considerably.
As regards the Solo option, I'd go for the seperates every time. As a rule of thumb you'll get a better sound. (I also don't like the buttons on the solo, they feel a bit loose)