Yes, the brown & brown/white wire does goes to the ignition switch. I am going to take a closer look at the wiring and connector on that switch. I might need to replace the switch, as the gen light is on all the time. The instrument cluster is out and I have easy access to the switch. The ignition switch from that terminal powers the Radio, A/C, Heater Switch & Wiper/Washer.
Now that I think about it more, I replaced that switch when I bought the car, so I had the only keys. I got the switch from Classic Industries awhile ago. I will dig thru my spares box for the old one and try that.