Take a look at this Valvet Class A amp. Only puts out 12 and 20Wpc into 8 and 4 Ohms, respectively, but that should be fine for your speakers and also should be a significant upgrade across the board over your current amp especially in the areas you mentioned wanting improvements. And this lightly used unit is going for only $2150 so could save you $$$ as well.
https://www.usaudiomart.com/details/649914534-valvet-e2se-class-a-power-amp/
Here’s a review fyi (the reviewer bought the review sample BTW)…
https://positive-feedback.com/reviews/hardware-reviews/valvet-2se-power-amplifier/
Hope this helps, and best of luck in your search.