Options when replacing race style steering wheel with OEM airbag wheel on 99 Boxster

[Century Rider]

Hi everyone, I'm a new member here and recently picked up my first Porsche! It's a 1999 with 125K on the clock and running like a champ.

I'd like to swap out the installed Momo steering wheel from the PO and move back to an OEM steering wheel with airbag. While Momo is sweet, I'd prefer the extra safety of the airbag.

That said, it looks like the 986 can upgrade to a 3-spoke set up vs. the MY99 4-spoke steering wheel.

Are these the right parts I need for a 1999 car? Will any year 996/986 combo of wheel & airbag work? Here are some samples I've found on ebay:

2001 steering wheel:

https://www.ebay.com/itm/01-PORSCHE-BOXSTER-986-STEERING-WHEEL-MANUAL-3-SPOKE-SPORT/124055049989?hash=item1ce241d705:g:ziMAAOSw9tFeJhM t

Airbag unit:

https://www.ebay.com/itm/Porsche-996-99-05-986-Boxster-97-04-3-Spoke-Airbag-Air-Bag-Black/162380304862

Here is car. Absolute blast to drive!