For the music you like, you really need a loudspeaker with 10 inch woofers to get realistic body and volume of music. In todays world of small manufacturers dominated high-end audio such a speaker has a very high price and most likely requires very expensive monster amps. Look for good old loudspeaker of the past, like altec lansing, tannoy, electrovoice, goodmans. You would be surprised how much natural their tonal balance compared to todays flavoured designs competing for small market niches of taste. Likely that your current amp is fine for them. Alternatively, you may give a try to an active speakers. Active speakers, as a general rule, do well the critical harmonisation between speakers and amplification. With passive components, it is just immensely difficult to get that right. As I see, this is one of the reason of the so typical cause of merry go round changes of components. Add to the active loudspeaker an old marantz, sony, tandberg, bryston preamp or a tube design, if you prefer a bit more lush sound. Actually, on many old solid state preamps you may find knobs to adjust treble roll of and bass. In todays design these are sin knobs which are reducing transparency. Thus audiophiles adjusting tonal imbalances with highly expensive cables and special devices. In real world however, if you could adjust treble and bass to your taste and to your room is a useful thing, and likely that below 100.000 USD system you wont really hear sound degraditon because of these knobs are in the signal route.