I am going to completely rewire and clean up this mess tomorrow.

The new off-road bike lights should be directly connected to the fuse box and not to the battery + the ignition switch should turn them off in case I forget to flip the switch (so I don’t drain the battery).