As a follow up, the fix was only temporary. A few days later the error came back. I took it to the dealer again and they verified the error was coming from a faulty connector inside the passenger headlamp. They replaced the whole assembly under warranty. All good... for now
Their price on the headlight is $1,100. Labor probably brings it to $1500 or so. Yowza.