@Rcord That's really helpful, thank you. Just to clarify, as you had the mount ready to accept the rain sensor, did you have to also replace the loom, or not?
I looked into the switches more, and with the help of my handbook I figured out that I need the 8V0941531AE switch:
That has both...