My Guess is that it's probably just the S6 or S7 Spider that's fubar, and maybe/hopefully the motor is fine.
The recall harness doesn't replace the sub harness under the nose (as far as I know).
You should be able to 'repair it' if it's just the spider.
If it were me, I'd try that before arguing with Yamaha, but that's just me. However, if it is in fact the motor, and not the harness. I would argue to get them to fix it. In the mean time I'd find a pull from a wreck, and fix the damn thing while the arguing commences.
Good luck.
FWIW, if it's the spider I'm thinking of, your turn front turn signals will be jacked, and potentially your headlights too. Though they were intermittent for me.
-MD