I will not buy anything with Micro-B USB if I can help it. I have a $100 bike light that is a worthless paperweight because I can't charge it. So far no issues with USB-C.

One option is to search for 8.4V CREE lights with an external battery pack on E-Bay. They're dirt cheap. You generally don't need a super-bright light. Look for something simple. Buy a spare as I've had internal connections go bad.

Then use your USB light for short trips and use the CREE light + battery pack for longer trips and times you can't recharge.