There are plenty of HX machines around. Add La Scala Burrerfly to the list as well as the Bezzera range. Near the top end in the Giotto Premium price range there is the often overlooked Bezzera BZ35, which has a rotary pump and needs to be plumbed in (this is a feature found mainly on commercial machines) but it can be run on an external tank (like mine). This machine has a great build quality inside and is very well laid out and easy to open up for adjustments and servicing. Truly worth a look if you have the space and are willing to look at around the $2800 pricerange.
As for grinder, Id skip the Rocky and go straight to Mazzer or Macap stepless.
There are plenty of options for high end machines. For a HX machine, my preference is for one with at least a 2l boiler. Why compromise your steaming with a tiny boiler?