You'd rather talk with the LBS whether the upgrade to Supernova is doable. My version of Vado is equipped with the M99 Pro and that's a special setup for Euro Speed-Pedelecs, with automatic day-light, automatic low beam and high beam on demand. The change from old 2017 BLOKS setup to 2020 TCD-W one required installing the whole Vado 6.0 upgrade kit, and half of the bike had to be dismantled. Not sure how problematic that would be to install the M99 Pro on a U.S. Vado.
Bear in mind that Supernova M99 Pro draws as much as 36 W in high beam mode and 18 W in low beam mode. The lamp alone costs US$520. Regarding the performance, I can only talk superlatives. The day-light is perfectly visible from far ahead. The low beam is asymmetrical and with cut off. The high beam is so powerful it was ensuring perfect visibility at a forest ride in total darkness with all details visible at far distance.
You might perhaps give up the idea of integrated light though. If you could afford Supernova, it is better to invest in CatEye Volt 1700: Even more light in high beam mode, 5 distinct modes, USB rechargeable battery that really lasts. Handlebar mounted. I also own CatEye AMPP 1100 which is smaller, lighter but the battery doesn't keep that long.
No experience with other lights.