Wow, those are completely different speakers. The Revel is a very detailed and high resolution speaker. I would avoid the Emotiva amp with this one, as the Revel is not a forgiving speaker. The Parasound A21 or higher would be excellent for detail, attack and slam. McIntosh would be great if you want a more laid back sound.
The Klipsch are very nice, but have a very unique sound. The Emotiva would probably be okay with this. Classic rock would probably be more pleasing on the Klipsch speakers. The Klipsch doesn't have the high frequency resolution of the Revel and it is not going to be as exacting to the source.
The loss of punch in your room could be a weak amplifier. That Yamaha receiver doesn't have a lot of muscle. Or it can also be due to the very large size of your room.