I have the cygolite mitycross 400 on the helmet and a pb 2w on the bike. It's a good setup. But if I were to buy something now I would want to ditch the separate battery pack.

I would probably look at the light and motion Urban 300 or 500. USB chargeable and side lighting to be seen in a top-quality package.