Sounds like so much work though, Peter :)
What year did your seats come from? I had the airbag light as well, could be that you need a recalibration in Forscan or, potentially, a sensor incompatibility in year.
If you run into any problems, I just finished my seat swap and heated seat...