If it were me, and is, I finally found an amplifier/ preamp combination that I am comfortable with at high volume, what little need I have for that. Find an amp, like a NAD with better than average "head room" Typically speaking most of their amps have generous +2~3 headroom to offer. This headroom allows plenty of rook for the dynamics found in most music. Their are other amps as well capable of high headroom like the NAD. Back in the early 1990's NAD offered a modest 20 wpc integrate amp- but could could cover high trasiant music that most 150 wpc could not touch!
Another really good idea was NAD's " soft clipping", so if you started pushing the NAD to far beyond it's thermal limits, the soft clipping kept smoothed it out. I think you probably do not have that much of an amp/ speaker issue, but a head room/ dynamics capability issue. Find an amp with more current capacity like a vintage NAD, Adcom, etc.
DC