Amplifier upgrade advice under $2000


Hi!  I have a new pair of speakers on order and want to upgrade my power amplifier to be ready when they arrive.  My current system is Klipsch Heresy III, Onkyo M504 amp, MiniDSP SHD preamp/streamer/room correction, and SVS SB12 sub.

Scheduled to arrive in December are Ohm Walsh 2000.  Research indicates these like a lot of power.  If the Ohms don’t work out I’ll shop for a used B&W 804, so still probably needs good power.

So, with a budget under $2000, wondering if I can get something that sounds significantly better than the Onkyo.  Used is fine.  Brands I have seen come up in the price range are Classe (ca-150), Vincent (331MK), Krell, PS Audio, Parasound, Bryston, etc.

I want to know if this would be a significant upgrade in this price range.  My sense is that brands like Rotel, Adcom, Emotiva, etc. would probably not change the sound all that much.  I also have a Crown ps-400, for example, that sounds pretty much identical to the Onkyo.

I recently tried out a Rogue Atlas Magnum tube amp.  It sounded great with the Heresys, a definite upgrade. Unfortunately  it created a loud speaker hum that I was unable to fix.  But it did make me crave the tube sound.  But it seems like finding a high powered tube amp to work with the Ohm Walsh is going to be challenging.

Sorry for the rambling, basically, is it worth spending $1-2K on a new amp or should I wait until I can get into a higher price range before ditching the Onkyo (which has those awesome green meters!).  Thanks!
judsondickie
The new Yamaha integrated amps are nice---the 2100 has lots of good reviews. Or maybe a slightly used Parasound HINT 6. 
+1 Mesch's suggestion on getting to know your speakers.

I've not owned most of these, have only shopped for them and gotten to know how widely marketed they are. I have done a lot of reading though, so here's my opinion as far as I'm comfortable offering it:

Many brands recommended here are very good. Some are by smaller makers that offer more quality for the price than is immediately evident -- I think that's why Van Alstine is being touted, sort of an direct-sale underdog with bang for the buck factor. 

You're going to pay a premium for Hegel and some of the others (Rogue, Parasound, Peachtree) will include a dealer and marketing overhead which changes their bang for the buck factor. However, they're also good companies with good reputations and you can probably sell them more effectively on the used market down the road. People know those brands and will buy them used.
Don’t fall in to the watts per channel trap. That is only part of the equation to measure power. You can buy an amp with only 20 watts per channel that would still have enough “power” to drive any speaker when you factored in all other power specs.
It is like a car engine. You can buy a car with 400 horsepower but no torque, then you can buy a tractor with 1000 feet pounds of torque and only 100 horsepower. Each serve their purpose but different. Then you can find an engine in the middle that serves your needs.
Post removed 
Lots of great suggestions!  Thanks.  It's crazy how many brands there are.  I was hoping like 5 people would all suggest the same brand but it seems lucky to get even 2 people suggesting the same amp.  

Also lots of sensible suggestions to get the speakers in first and get to know them.  But who wants sensible advice!?  I've got the bug to spend money now! Haha. (I should probably follow the advice). 

Anyone who has actually heard an Onkyo m504 to compare?  It gets mixed feedback online (some incredible, some terrible), I just don't have much of a sense of how it stacks up.