[SteelHeadz]

seems like the Black and yellow wire coming out of your headlamp switch is not cutting off the battery voltage when its switched off. pull out your headlamp switch and disconnect the harness connector from it and see what happens. if it shuts off then the problem is in the switch, if not, there is a short to voltage on the harness somewhere.the key here is the Black with yellow wire.pin 9 of the connector.