While upgrading your source will probably give you an improvement, and going to tubes will most likely sweeten up the sound, it sounds to me that you need to work on speaker placement. Klipsch speakers can get a little shouty, especially when paired with a brighter integrated like the Yamaha. Good speaker setup is crucial.
