Franks post above is good advice. Given your comfort level you may or may not be confident tackling your own customizations. There seems to be a constant draw on the battery even with the key off so I wired in a simple on off toggle switch that cuts all power on my bike. Did you ever have this issue Frank?
YES, 2 weekends ago I went out for a ride and 20 minutes out, I looked at the ammeter and it was pointing into the negative while I was whizzing along well above charging RPM's. I turned around and headed for home. Because the ammeter was pointing negative while the bike should have been generating a positive charge, I started at the most exposed part of the charging system, and traced the stator wires coming out of the back of the primary. I didn't get too far and I found that the slack in the wire caused it to droop and one of the stator wires was cut through by dropping onto the drive chain right at the sprocket. I repaired the wire and started the bike. The ammeter now pointed strongly into the positive, showing that I found the culprit Ammeters show direction of electrical flow. I particularly like having one. It shows undercharging problems better than a voltmeter, but the voltmeter shows overcharging better.
I also protect my terminals with a thin plastic battery cover. I do miss that rats nest though. Here are some more grim photos for fun. Maybe you can pick out something helpful amidst the grime
This is just MY opinion, so bear that in mind,... I hate the cloth wiring sheath. Take a sharp sissor and cut along it length wise to get it out of there. It doesn't protect the wires, it just keeps you from getting a good look at them buy some of this instead to replace it where the harness is hidden, then electrical tape up and zip tie to the frame the more exposed wires like the rear lighting. It's easy to peel off to inspect the wiring if you have a problem and it's strong protection against abrasion.
Electrical work is like surgery and cooking, Cleanliness is the first thing to accomplish. Dirt is a part of corrosion. Clean the shit out of every contact (and the whole component actually) Replace any blade connections, (male or female) that look questionable and soldier ever single connector onto the harness. Crimping terminal connections works for a while, but not only does it allow corroesion to sneak into your wiring, but it's hidden from sight too by the plastic sheath on the connector. Pull the sheath back on every connection soldier it, then slide the plastic sheath back in place.
I use dielectric grease on blade or barrel connectors. I like barrel style connectors best because you can shrink tube over the connection after you've assembled them. That keeps corroesion out, and holds the connection together. Blade connectors don't seal up as nicely in the shrink tube application...
*Sorry, I'm long winded. It's a gift and a curse...
Regarding your drain, Get rid of the cloth sheathing, trace every wire, inspect and clean every terminal connection, soldier every terminal connector and replace any questionable connectors, Clean up every component and their terminals. When you do this, everything will be clearly "good" or "Questionable" by just looking at the wiring. Your drain will either be discovered as a ragged wire touching the frame or headlight shell, or you will fix it without ever finding it just by cleaning up your harness and components.
Now, my pet peeves (as if you didn't think you heard them yet) If your bike leaks oil because you didn't want to buy a reed breather, then your electrical system will eventually be covered in oil. When you look at your bike, you see a rat's nest instead of wiring that looks healthy. When you touch your wiring, your hands are filthy in the first 5 minutes,... and lastly OIL and electrical tape make a gooey paste that covers your wiring. As soon as your taped wires get oily the tape starts to unravel. The answer is to NOT have an oily bike... at least that's been my answer. It makes working on the bike's electric's much less of a mess.
Be persistant, you'll get there...