Headlight Switch Problems

[Kevin Kirwin]

Got some funkyness going on with my headlights.  Car is an Avant with
Relayed Euros.  Here are a few of the strange symptoms...

The city lights are on all the time even after I shut the car off and the
key out of the ignition.

With the car off and key out of the ignition when I flick the headlight
switch all the way up the city lights go out (dash lights come on as
normal).

With the key in the ignition and turned to the on position when I flick the
headlight switch all the way up the passenger side High Beam comes on.  When
I push the headlight switch forward to high beam the passenger side light
goes out and drivers side high beam lights up.

Things I have checked/troubleshot...

Inline fuses in the wiring harness are fine.

Fuses in the fuse box are fine.

Relays have been swapped with known good ones.

Disconnected battery and cleaned the battery charging post and connection
from Euro wiring harness with sand cloth to ensure strong connection.

Changed bulbs.

Checked wiring harness for f'ed up wiring.

Installed a used headlight switch from another avant.

Both switches are giving the same weird light symptoms.  Should I assume
both switches are toast since I have the same problems?  Is there anyway to
test the switch?  Also, is there a way to take the switch apart and repair
it?  Is the guts of the switch under those small torx? screws?

TIA

-Kev