>>But, leave headlight switch on and reconnect battery??, sounds like potential spiking problem to me<<
I might be understanding this wrong but I was told by a peugeot master tech that they switch the headlights on before connecting the battery, to reduce the surge and avoid bsi problems.