Did you check for the presence of AC volts at the battery with the engine revving? If the diodes in the rectifier leak, it won't be good for the battery and if its very much, it won't be good for the lamps. And head lamps are expensive if they are original.
Rick