Another vote for finding a bag that fits your gear from the ThinkTank line.

One option to consider is a photo vest during boarding if weight limits become an issue. I use this vest:

http://www.bhphotovideo.com/c/produc...st_Medium.html

And you won't believe the amount of gear it swallows. Once onboard, just repack the gear in your bag!