2003 Driver Door Lock/Air Bag Light

After taking my 2003 CRV back to the dealer for the airbag recall, I have started having problems with the "Side Airbag Off" light coming on intermittently. Shortly after that started, the driver's door lock stopped working. All the other doors lock/unlock fine using the remote. I've tried pushing the driver's door lock button down manually, but it won't go down far enough to lock. Due to the side airbags, I'm hesitant to remove the inside door panel to get a look at the lock mechanism.

Any ideas?