cloth diaper enthusiasts and chubby thighs, a work in progress

We are in the process of transitioning into cloth diapers.  Tilda comes to university with us during the day, wearing disposables and at night we've been trying various cloth diapers, bummis, bum-genius, flats, fitted, and the rest of it.  There are all-in-ones, wraps or diaper covers, and fitted diapers.  Then, my wife is recently taking on the task of making our own fitted diapers.  So far, we now home-made burp cloths from flats.  It's been tough finding what works best.  But, we've learned that Tilda has chubby thighs and apparently the bummis are no good for chubby thighs as they are too tight and leave elastic strangle marks that do not look comfortable.  The bum-genius are nice but they are an investment only to be made with certainty.  We recently acquired a wool wrap but we've not yet tried it out.  Same with my wife's first fitted, which is just recently off the development line, we've not yet tried it out.  Anyway, we're cloth diaper enthusiasts, but it is a work in progress.