I pulled the sockets from the gauge clusters and left them hanging until I could get the lamps to turn on.
Your diagram is great. I'll start testing this week, especially on the front post.
I did not realize the switch rotates. Maybe that is all that is is. I'll try that tomorrow.
Many thanks and congratulations on your recent excursion!