Here's an update I ended up cutting the rear of the bike down, while at the same time handling my handlebar situation.
My switches were badly cracked and sticking. (I ended up finding out there was an infestation of little black and red bugs, that I couldn't identify)
My front brake master was also seized and scored beyond repair. The rear master was also broken at one of the ends and did not work.
I bought a new "universal" exact diameter front brake master and scavenged some spare Honda switches that I had sitting around.
I also had a Magura choke from an old BMW oilhead I think, sitting around. I assembled everything together on Renthal handlebars.