If that’s the case (which seems pretty slim chance of happening) you should do 3s2p 18650 and make a long tube where you can choose to put 2, 4, or 6 batteries in and scrap the idea of charging.

Even better since we are dreaming make a buck-boost driver and have either two tubes or an extension tube so people can do 3p or 3s2p or anything in between!