I kept the front light, because if was difficult to find something better that isn't put at risk when folding the bike. I added an on/off switch to the dynamo wire. It's a 12-volt rated water resistant toggle switch, mounted to a small plate of aluminium bolted to the light mount. When it's off, both lights are off and the front wheel spins much longer, so it seems to do what it should.
https://www.flickr.com/photos/gunnst...7700342795322/

I replaced the tiny caliper mounted taillight with a bigger standard carrier mounted light with a reflector. Point shaped light sources give little indication of distance. Bigger (not necessarily brighter) lights makes it easier to judge changing distance for someone who approaches from behind. I had to extend the cable and lead it up to the carrier, making sure nothing is damaged when folding. Not a great photo, but you can see it under the carrier, behind the roller wheel:
https://www.flickr.com/photos/gunnst...7700342795322/