lipo-rider, batteries and solar panels

Just connect solar panel in parallel, you don't need any diodes or other components.