I got a free modern baby bamboo pop-in and I really like it, but it is quite tight on dd who is 16mo. So I don't want to buy any because I think she'll out grow them before we potty train. I really like that it seems really cozy and pretty slim fitting, I want a similar style but a little bit bigger, any suggestions? It is a soft wrap with a plastic bit inside to keep it waterproof and it has two inner bits that are shaped and popper in.