Thanks for the reply. That is a type of setup that I was thinking of. I have seen a few threads were people talk about different sleep modes that you can use to help with battery life. Maybe that is something to look into. I hope the changes give you an increase in performance.
You might find this thread interesting in regards to increasing run time for those cloudy days using a few 18650s.