Audio/speaker harness ends

[Zordrack]

Hey guys,

I'm replacing the stereo in my 2000 S.
As part of that I'm replacing the rear storage cubby/speaker shelf with the Bose subwoofer shelf from the 987 (yes, also replacing the drivers in that before I put it in).

I would really really like to not hack up the original wiring harness, and retain the ability to simply detach the speaker shelf.

For that my plan is to make an adapter to go between the 986 rear speaker harness and the 987 speaker shelf.

Does anybody know where I can find, or should start looking, for the shelf side of the 986 and the car side of the 987 ?

Bonus would be if I could also find the 986 door subwoofer connectors as I plan on replacing those as well.
I already have the connector for the frunk amp so I can adapt that to an aftermarket amp without cutting the harness.

Any help would be greatly appreciated.

Thank you