You didn't mention what you're using for a source. IME it's the most important component, and upgrading should normally begin there.
With a better source you may (should) find that you get more clarity without extreme volume levels.
With a better source you may (should) find that you get more clarity without extreme volume levels.