I ended up getting this kit.
https://www.amazon.com/gp/product/B08KG5GJRD/ref=ppx_yo_dt_b_asin_title_o03_s00?ie=UTF8&psc=1
My bike has the same connections, so this was plug and play, mostly. I did have to create an adapter for the power source. I used the source from my existing rear light. This kit replaced that too. It's a great kit. The only issue is, that the power source is 48 volts. I believe this high voltage is making my brake sensors "stick". I never had a braking issue before this kit. I was reading that if a reed switch has too much voltage, then it could stick. This makes sense so, I bought a step down converter to create a 12 volt source. Hopefully that will resolve my issue. Great kit, all together, though. There is also a version that has waterproof connections. I'll probably get that kit for my wifes bike when her warranty is up.
UPDATE: Yes, the high voltage (48v) to this kit was making my brake sensors "stick". The step down converter resolved this issue, but the tail light won't function on 12v. The turn signals and brake light work with the 12v supply just fine. Which is ok, I have an extra 48v supply that I can use specifically for the tail light function. Everything now works great!