Don't over look the head lamp dimmer switch. These things can run you nuts and can cause a flicker like you described.