I Cimbali Jnr S is essentially the same machine you have now - but with touch pad/buttons for dose/off. I have the DT/1 version ( dose /volumetric buttons + rotary pump ) and absolutely love it! Commercial grade quality on all components, and very easy to work on ( should you need to ). And quiet.
I'd be careful you don't go 'backwards' if looking at even some of the higher end domestic machines - just do your research and try some if possible at showrooms, etc.
If you really feel the need to upgrade, you should be able to comfortably get something suitable in that budget though.
Best of luck with the shopping ..!