Flickering lights

[Doubeleive]

with a severe rust issue I would probably default to just adding grounds where ever reasonable, nothing wrong with adding grounds
I have solved flickering lights before by adding grounds to the headlight light circuit.