Yep. You got it.
Get that aluminum spacer outta there and you're ready to go.
Toss that old, leaky switch and be sure to use a brand new aluminum crush washer with that Italian switch. Snug it up but do not over-do the torque. I use an open-end wrench. Plug in the wires and call it done.
Re-fitting the spacer is a small chore. I tried freezing the spacer but the chassis is just one big heat sink. Best luck was grinding a small 45-degree angle on the ends and working in into place. Plastic-tipped hammer guided it home.
Remember to clean off all the nasty oil n' dirt that's collected on the transmission 'shelf'.