You are probably onto something with the solenoid acting up. If the solenoid pulls vertically it is probably the original. If it pulls horizontally it has been retrofitted to the new style. Login to read more.