Okay, so the more I play, the more I find and the more I want to fix.  Yep, both viruses have well and truly taken hold - Datsunitis and Restroatic Plague... 
 
From what I can gather, the under bonnet hydraulics of the disk brake conversion is a mixture of 1000 Deluxe (or maybe late 1200) dual circuit master cylinder and original single-cylinder 5-way line connector.  I don't like it at all... Not only is the original rear line crimped at the connector (as it now has it's own circuit), but it also has the hydraulic brake light switch.
 
Which bring me to this post: My brake lights are staying on.  
 
When I first took ownership, I did have to bleed the system, as apparently they were never done since the conversion.  However this issue only came to light in the last week or so.
 
What could be causing the lights to stay on?  Is it possible there's an errant air bubble in the system that's worked it's way to the switch?  Or could it just be blocked with age?
 
Down the track I do want to change the connector to the 3-way one, to keep in line with the twin pot, and fit an electrical switch to the pedal arm (if anyone has a 3-way connector and electrical switch, please get in touch!!).  Right now though, I'm hoping for a "quick fix" to this cursed hydraulic one so I can drive her without worrying about my brake lights on constantly, or forgetting to disconnect the switch and flattening the battery!
 
Cheers,
Alan.

I found a 3-way and switch Mike (Kman to the rescue...Again! ), but thanks anyway mate. If you're home this arvo though, mind if I come over after work (between 1 and 2) and see you about those other bits you spoke of?