Personally I would be looking at speakers before an amp. I upgraded my amp before speakers just to find out there were much better amps for the speakers.
I had a Denon Pma 700 with Mission/Cyrus 782 speakers. I upgraded the Denon to a Bryston B100. The Bryston was better but not by a lot. Then I upgraded the speakers to Dynaudio C1's. Now that was a huge upgrade and was very happy. My Dyn dealer kept telling how much better a new amp would sound. Well I thought about it for about 2 years thinking it couldn't get that much better than what I had. Then I started thinking about tubes. Finally I asked my dealer to demo an Octave integrated (V80) and it sounded much better at his place but didn't bring the B100 to compare side by side. About a week later he came to my home with an Octave V70se. Before the tubes even were warmed up I knew that was another huge upgrade. About 10 min later when then tubes warmed up I couldn't believe what I was hearing. He said I could demo it for a few days but knew right then I wanted it. Yes I did purchase the Octave and still have it.
That being said amps do make a difference but also I learned it was easier to match an amp to speakers than speakers to an amp.
Just my opinion based on my experience - Good Luck
I had a Denon Pma 700 with Mission/Cyrus 782 speakers. I upgraded the Denon to a Bryston B100. The Bryston was better but not by a lot. Then I upgraded the speakers to Dynaudio C1's. Now that was a huge upgrade and was very happy. My Dyn dealer kept telling how much better a new amp would sound. Well I thought about it for about 2 years thinking it couldn't get that much better than what I had. Then I started thinking about tubes. Finally I asked my dealer to demo an Octave integrated (V80) and it sounded much better at his place but didn't bring the B100 to compare side by side. About a week later he came to my home with an Octave V70se. Before the tubes even were warmed up I knew that was another huge upgrade. About 10 min later when then tubes warmed up I couldn't believe what I was hearing. He said I could demo it for a few days but knew right then I wanted it. Yes I did purchase the Octave and still have it.
That being said amps do make a difference but also I learned it was easier to match an amp to speakers than speakers to an amp.
Just my opinion based on my experience - Good Luck