Two things.  One are the terminals on the back of each switch labeled the same.  Second, you need to trace the wires from the switch to the appropriate components.  I am confused by the G terminal going to the points and the M terminal going to ground.  If I started to pull the little hair I have out, I would try to reverse these two wires and see what happens.