In your last picture it looks like the fitting of the rod to the solenoid is a little insecure, is it just the picture? I think id be tempted to add locktite on those screws to prevent vibration, or could you not simply hook the rod into the hope ontop of the new solenoid?
Looks a clever mod and saves the pennies, and easy/cheap to replace when the cheap one breaks too.