Well,you obviously know what you may need to do in your 3 repair possibilties.I would start with cleaning and work backwards on your list.It's seems the solenoid is not always being
"magnetized" or electrically charged. Do the cheapest,easiest thing first.I recently had a '55
Chevy solenoid that had a bad internal contact ring and required a replacement.
