Electrical. Switched Ignition and Headlight plug?

I finally got my bike started after a year of "restoring" (tearing apart, breaking, learning, repairing, replacing). Before I tore it apart, it started on carb cleaner and ran on choke, and the headlight did come on.

Since then I tore down everything, repaired all the electrical connections, packed with dielectric grease, replaced the fuse box, etc. And I made careful markings of which plugs were which behind the headlight. But I think I may have mixed up the ignition and the headlight.

When I first got the bike started a few weeks ago, the headlight didn't come on and when I revved it the neutral light got really bright and now the neutral light doesn't work anymore. The red oil light still comes on (if you try and start the bike not in neutral with the clutch out), so the other gage lights are still working. but i don't know. I'm kind of at a loss.

But you guys have helped me with everything so far, so maybe you can help me with one more thing... (fingers-crossed)

 

I haven't torn into my 650 Seca very far yet, but if it's anything like the 550s, the connectors (at least the big, important ones) are pretty much "idiot proof" in that they only mate with the correct one in the shell.

Sounds to me (right off the top) like a headlight relay that's stuck.

 

I remember them all being "idiot proof" because every single plug behind the headlight was different, except for the ignition switch and the headlight, they were both (or are presently) three-pronged plastic plugs. And I know the wires are color coded so I'm pretty sure I matched up the right ones.

Headlight Relay? its possible. How would I got about checking it?

And does that relate at all to why my neutral light isn't working?
or do I need to check the neutral switch too?

Cause everything was working when I first turned the bike on (except for the headlight). And then when I gave it some juice the neutral light blew. Fuses are fine and the Oil light still works. I feel like both of these electrical problems are related. Maybe there's one simple solution. Or maybe thats just what I'm hoping for.