Definitely treat the room. And, as has been suggested, going to a different IC can often help with the shrill highs. Although I prefer silver cables with our tube-based system, I found the Audience AU24 IC and the Analysis Plus Crystal Oval both took some of the high end edge out that is present with the silver IC's. There are many excellent options out there.
Hope this helps.
Hope this helps.