I'm in the same position, I want a 3 spoke wheel but not really that keen on losing the airbag. We'll see though, I might just bite the bullet and buy the OMP wheel that I've wanted and lose the airbag...
The main reason why I want to swap is just cause the factory wheel is huge and it's hard to drive aggressively with a school bus wheel.

Curious what the wheels are...
What middle man service did you end up using?