Is there any chance you don't have a good ground on your instrument cluster? Sometimes, lacking a good ground the instrument lamps can seek ground through another light (ie headlight lamp) until you put power to the second lamp. Worth a try. Other choice is likely the headlight switch. If you are considering replacement anyhow, sometimes you can carefully pry the tabs on those old switches, remove the guts and clean the contacts.
