Have you connected a flyback diode across the solenoid yet? The best place to put it is right at the solenoid terminals.