So are you using 18650 cells?
I'm using single cells in parallel (2.8v to 4.2v) using a battery management chip (an easier circuit option is the bq25892) which includes charging as well automatic power path charging and switching from usb and...
If your looking for power savings I got rid of the 3.3v linear regualtor and power mine off a 3.3v buck booster TPS63020 (which is supplied by a BQ25798 power management chip) ive had no troubles with power quality
You need too use a couple...