Since the prior pic. I added two paralleled diodes in series to prevent the motor from running when connected to the battery. These Radio Shack Diodes cause ~ a 1.2 volt drop in voltage, or ~ 10% lost to heat. Schottky diodes are on order which have ~ .6 volt drop or ~ 5% lost to heat. The switch you see bypasses the diode/s so if you flip it on when you are running the motor fast enough to generate power you gain 5 or 10% output. You just need to flip it off before you slow down with your pedaling.
This diode / switch arrangement was implemented on both the option A) and option B) Electrical Boxes.