I would say bugger the baby bag and just go buy yourself a nice big tote or something.

I have two baby bags but I rarely use them - I use totes or other big bags that I have - it's way less restrictive and I just chuck the change mat from the baby bag into it and everything else that goes along with that!