Sanity Check! Diode Switching on Mudbunny and QOB

[Sharkteeth13]

So I am working out replacing the dip switches on my Queen of Bone with a toggle switch.  Can someone verify my wiring is correct with a on-off-on SPDT toggle? 

Secondary question.  If I set up a diode switch with a DPDT toggle on my mudbunny and connect it to D1, do I need to jumper the other diode pads?

Thanks!

[Sharkteeth13]

I guess it would be helpful to add the schematic.  I am trying to split the 4 dip switches into two toggles.  Is what I am looking for possible or will I just have to do four switches?