Old topic, but I wanted to mention that the X1Plus firmware permits some changes in button usage.
The firmware distinguishes between short and long button presses, providing four functions from the two buttons. So now we can finally choose a true emergency stop, using our choice of a long or short button press.