That looks right. However, I have had a look at the construction of the solenoid. The armature is solid so there will be in effect a shorted turn which will restrain the flyback voltage to some extent. Also, the pump will work for quite a while without modification so I would not bother fitting...