xRayx: Thanks for the write up, I did this last weekend and it went very well.
I wound up grinding the soldered tip of the adapter you described to make it more pointy since I was having trouble inserting it behind the connector. Yes, it was a bit challenging to fit my thick fingers and reach the clips to drop the sunroof/light assembly, but it can be done with patience.
-Walter
PS= how many times have you guys popped open the cupholder with your back during the install?