Small solar panel and diodes
If you incorporate a cheap, off-the-shelf charging module between the solar cells and the battery you will solve all the problems, over charging and back flow through the solar cell. A typical one is here Many other similar modules are available on eBay and Banggood. Again other suppliers are available.