I found this site yesterday. These are the #6 male/female inline switch fittings for either the 7/16-20 Trinary switch or the M10X1.25 metric fitting. I have a call into them to make sure that these will work. If so...the switch quandry is over.
Just confirmed with them and these fittings will work
https://coldhose.com/universal-switches.html