The headlights switch in my son's 1988 90Q doesn't work anymore (despite dismantling, cleaning, etc.). Low beam contact is intermittent and the flash function gone. We found a 1995 90Q at the boneyard, it has the newer style stalks (rounder). Can someone confirm if those will fit? Thanks. Radek.