Justin, you nailed that one and I have absolutely no good news for you. Take a peek at my latest schematic. I added another Diode, now there's two (D1, D2) in series with your uPuck input. This was done to keep the voltage input to the uPuck < 3V when Vbat is (4.12V) fully charged. Q4 was added...