2014 Sierra HID and DRL issue

I purchased a 2014 Sierra SLT that was originally owned in Canada. It has the BCM flashed for Canada law requiring the DRL's to be on if the vehicle in in gear. The vehicle has the LED strips across the top of the lights and the actual headlights come on as DRL's. The light switch also has a spring in it to automatically go to the "auto" position. The daytime running lights are causing a problem with the HID headlights. I can hold the light switch to the off position and start the vehicle and the lights stay off. When I continue to hold the switch in off and drop the vehicle into gear, the DRL's come on. My question is 1) can the BCM be reflashed to behave like a US Sierra or can I purchase a BCM already flashed? 2) Can I take the switch apart and remove the spring allowing it to be manually set to the setting I want? Any suggestions or potential fixes? Appreciate the help!

Wrong forum.