Check out Fenix. I was super happy with my Fenix headlamp, so when the time came for a new bike light I was pleased to find they make solid options. Removable battery, good brightness, good adjustability to not blind others, used it road and mountain biking at night. Easily unclips from bar when you’re leaving your bike locked up somewhere.
I usually have a few bags on the go as well, variety is nice. Once there’s not enough left for a cup I’ll wait until another bag is in a similar state and combine. Sure it’s not as fresh and sometimes it’ll be a weird blend, but usually super good enough.