Moonbiker, you should use this as an opportunity to upgrade and get dynohubs and LED lights. In fact, few bikes are sold anymore in Germany with bottle dynamos. Most will come with dynohubs. The negative of upgrading to dynohubs is that you need to get whole wheels, but then you can turn it into a positive since you need to put together a significant order if you want a German vendor to move and/or otherwise want to spread the price of the shipment to the US. Within dynohubs, optimal are better Shimanos and, in LED lights, B&M IQ Cyo.
If you go again with bottle, you will be switching to dynohubs anyway within a couple of years, so why the extra expense and trouble.