I find the cubby one easier than above clutch pedal. I go in from the cubby drawer, remove it, move the relays to the side by releasing them from the tabs, and then the canbus is straight ahead. Pull it back towards you, undo the red plug and then swap over with new and then reverse of removal. In my opinion I think it'd quicker than wiper motor route.
Sent from my SM-G928F using Tapatalk