An amp upgrade could certainly tame your top end peakiness. I've had some issues with metal domes tweeters in the past trying to balance detail with harshness. The Wyred4Sound ST-500 has a soft top end, gobs of power with good bottom end slam and control, is detailed, and images well. There are many reviews available for more details. I found it a pleasant amp, dynamic when necessary and yet capable of subtleties as well. It would probably partner up well with the Kappas.
Another option would be cables/plugs to tame the high end (though I would loose the Yamaha regardless). Good luck.
Another option would be cables/plugs to tame the high end (though I would loose the Yamaha regardless). Good luck.