My Vado Is Back!
Finally. Got the bike upgraded to the TCD-W, which included the new headlight, high/low beam switch, separate horn button. Also serviced, with the new chain and the 11-46 cassette as in the original bike spec. Interestingly, the Euro-spec S-Pedelecs need to have all-day lights, and technically, my Vado is a moped. So I got the headlight specified for the 6.0, and it is the Supernova M99 Pro. 1600 lumens in high beam! Happy to get my bike in no worse shape than it was before, happy with the ugly but strong Supernova but I won't take the services of that LBS anymore.
Aha, Mission Control would not connect to the TCD-W on Android 10. Surprise!