i think you will need another commercial HX to be really happy... after 5 yrs it would be hard to go back to a small boiler machine. I love the power of mine ;)
your budget will also only buy you something that is similar to your 2grp unless you score a bargain
consider the "keep the current" option as the risk of swapping into something with extra repair cost is possible...
tough challenge and choices :)