For lights, I have settled on Blackburn USB rechargeable. They are guaranteed so when they give up on you, Blackburn replaces them. Nice that you are back riding.
__________________
I don't do: disks, tubeless, e-shifting, or bead head nymphs. But I do hate all e-bikes.