jmx, you are spot on with the recommendations, insight, and I couldn't agree more with the general tone of your post.
In my case I have more room to work with but, the recommendations are basically the same. Go to a good high end store and demo some good equipment and you will appreciate the wisdom of jmx's words. I thought I had some good audio gear. Then I went to a really good high end store and listended to some MagnaPlaners (sp?) (electrostatics) and some B&W's. Playing my CD's, I heard things in the music that I had never heard before. The crispness of a drum stick hitting a snare drum (not just the resulting tone but, the drumstick's initial impact on the drum skin). The pluck of a guitar string, the clarity of a flute solo, and on and on ...
The system will only be as strong as the weakest component so, don't scrimp on the amp to get better speakers or vice versa. Doubt me? Goto a friends house with a good stereo system and swap out one component and listen to the difference.
A lot of people want a high power amp for LOUD music. That misses the point unless you are into deafness and want to shake the foundation of your apartment complex. Good CD's, especially a lot of classical CD's, are very hard on amps. A lot of "headroom" or extra clean power (wattage) will allow the sound to come through without distortion at reasonable listening (volume) levels.