I finally received the custom printed PCB for the hats, to replace my old charge controller I hacked together from spare parts. You can see it here:

Other than being smaller than the old electronics module, its also more efficient, can charge (slowly) in low light conditions, and allows the battery to be charged from external USB power. Going to do more testing with this soon, stay tuned.