Hi,
I don't want to sound rude, at all, and welcome to the forum. Those are quite a few components to look for to see their pinout to fit to the schematic you posted. Other members may not be able to spend so much time looking for the information. Do you have any electrical experience? It sounds as though you possibly do. Why not modify the drawing yourself how you think it should be done? - Then maybe a member who understands these switches can comment, if comment other than confirmation that the modifications are correct is needed.