A year later still starts solid.
Solenoid terminal with pigtail 82998-12480
Solenoid connector 90980-11400 (only needed if your latch is broken like mine was)
I'm about fed up w/ the click no start, but want to try this repair before I go with the aftermarket solutions.
The terminal with pigtail plugs into the starter? I assume you have to splice the wire judging by this picture from Partsouq: