Jason, you must have a hell of a lot of gear. Why not put some of your bigger lenses in lowepro's slip lock cases which externally fit the 400AW, or slipped off and in to your luggage.
I have the same bag and the much the same problem, my next move is to move my 70-200 and 100mm macro to
Sliplock cases.