I'm assuming that you have OS diapers with all the snaps all over the front that you adjust with? I honestly have never used those. We use FuzziBunz OS, which have waist and legs elastics that you adjust. They do have snaps on the front as well, but that's mostly for "fine-tuning." The FB OS are super adjustable, and I can relate to your baby's size because my DD was that way, too. She still wears them and is now 11 months and about 23lbs, and those diapers have plenty of room to fit her for months to come. If you look on the FB website, it says that the OS should fit up to 35+lbs, which is (on average) about the weight your LO would be when they potty learn. Wouldn't hurt to check out! HTH!
