Get on the German websites, Bike24, bike discount starbike etc. Grab a cheap SP Dynamo hub. One of the AXA headlights, a B&M toplight tail light. When you decide to tour, add a Forumslader or a similar high capacity dynamo to USB with cache battery system. Don't bother with an integrated light/USB system, the output is too low to be useful. I use a Forumslader set up to charge from the hub, but also portable to act as a battery
Solar is a PITA on tour. Been there done that. You have to worry about finding a campsite with sunlight, spreading out a panel over your luggage and worry about people stealing said panel. A USB battery pack with a USB-C fast charger would be a better option.