Thanks everyone, it is definitely the dimmer switch.
I thought the P.O. might have added a terminal relay of some type because I thought the dimmer would be lower on the firewall, but it is the dimmer. The stop switch is actually more towards the center of the firewall and the "fingers" on it are the bullet connectors (I had re-wired that switch previously when I wired a turn signal indicator to the rear lights).
I've seen lots of posts asking about putting in new wiring harnesses, I'll have to put in a post with pictures once I complete this. It's actually going pretty smoothly, the only difficult part is I can't "cheat" and use the "color coding" on the old wiring harness since its faded/painted over and the shop manual wiring schematic doesn't show the color coding anyway!
Merry Christmas to everyone!
