I can see your concern. I think others may have missed that you mention that while in sposies your bubba could sit up etc but now can't while in cloth.
Maybe you could look into a trimmer day nappy? I find my AIO Daydreamer Wildchild nappies to be nice & trim on Isla. There are a few different brands out there that may give you a trimmer fit then the BBH's.