Gen 2 seat swaps... conflicting info

I've just been reading through quite a few threads on seats. My 2005 Gen 2 seats are old and tired. A local salvage yard is selling 2007 Gen 2 seats saying that they will fir all Gen 2s.

Another post on this forum said the same thing, but when I looked up part numbers, the 04-05 Gen 2 has a different part number than the later Gen 2s.

So, what's the difference between early Gen 2 seats and later Gen 2 seats (my 05 does have the seat airbag option, and on the 07 it was standard)?

Buying the salvage seats will be cheaper than re-upholstering the old seats and replacing the pads. And the airbag connecter will be plug-and-play, but before I buy them, I wanted to double check.