Check out the Unison Research Triode 25. It is an EL34 based Push Pull that is 25w. It’s a nice amp and should address most of your issues. At $4500 retail it is on target in terms of pricing. It delivers the quality that you want. They have good support in the US as the distributor is strong.
PrimaLuna, Decware, and Line Magnetic would all be viable alternatives in your price range. You could also look around to see if you could find a used, Art Audio Carissa. Hell of an amp.
Full disclosure...I am a Unison dealer.