i have the same problem . i think same batch as yours . GEn2 highline with beige dashboard .
luckily my bags doesn't deploy. it just got short circuited and cannot be started. :'(

dont remove the airbag unnecessary, you've paid for it therefore let it be there.
as for gen2 , u can know the problem of it when you turn the steering wheel, the honk will automatically comes in , cruise control malfunction. and the earliest stage is the radio control buttons on the steering gone haywire .