I'm getting tired of batteries, so I've ordered a SON front hub.
I still need to come up with a headlight and a taillight to go with it.

For the taillight, one of the things I'm considering going with a straight inductive taillight such as the Reelight inductive lights. Perhaps one of the SL600 series lights for a mid rack mount.

They use very little power, and there may be an advantage of letting the taillight flash during the day while the headlight is off (and conserving power).