Enjoying this thread very much!
I recently replaced the solenoid on my M600. This unit is a perfect fit for the original and works well.
https://rover.ebay.com/rover/0/0/0?m...2F152166099915
It is hardwired and so I had to change the connectors, but it’s relatively neat and also out of view, underneath the tank and battery box.