Oldgirl

I hope I'm posting this correctly. I've been a long time veiwer but just subscribed as I have a problem that I can seem to figure out and hoping someone can point me in the right direction.

1987 body with all 1990 s5 parts and wiring.
I combined to cars about 10 years ago and then promptly lost interest since I couldn't get it running right. Since then I've fallen back in love with old girl and got.her running nicely but now have a headlight issue.

Relays have been replaced

When i ground the white/blue wire form the headlight relay the lights come on for as long as its grounded.
From reading online that means the switch is bad?

The headlights wont go up unless i use the cleaner switch above the light switch.

Originally when i was testing the circuit, the headlight switch raised the headlights put wouldnt power on the lights. I accidentally applied power to the white/blue wire and the headlights went down and wont come back up unless i use the cleaner switch.

No burnt wires unless its further down the main harness…ill check to be sure. Retractor fuse is good and no other burnt fuses all other lights power on.

I picked up a used light switch but no luck. Picking up a for sure tested one tomorrow and also ordered a rebuilt one from 13betc.

Any thoughts from you masters?