The light switch/fuse unit you changed is a known problem component. I had mine changed under warranty at 17K miles (2 yrs ago) I had intermittent headlight problems and playing around with the fuses did temp fix it, but I took it in and they said immediately what the cause was and changed it FOC. It also would be repairable if need be by removing. The issue is caused by bad earthing and shorting.