Congratulations on the birth of your DS & hats off to you for using cloth already!
I only have one in cloth so hopefully someone with more experience will pop in. But my Kapoochi Carry All nappy bag is pretty big! I'm sure that would fit in everything you need. Or how about giving your DD a little backpack to put a few things in like her drink & snack to take the load off your nappy bag?