Travy,
You're lucky when you can find a perfect solution to gear transport. I gave up trying and made a comprimise that has worked well for me on about a half-dozen international dive trips.
My solution starts off with the basic assumption that even the best gear protection is meaningless if your bag is lost or stolen along the way, so the best solution is the one that allows you to keep your gear by your side (the only exception is putting a bag in the cargo hold on the runway - so you see the bag go on board).
With the above assumption in mind, I put my most delicate equipment in a Pelican 1510 (the largest Pelican case that can be carried on - and it has wheels) and carry the rest in a generic gear bag that has pleny of pockets and padding. This bag is also where I put heavy stuff (because they don't weigh carry ons - - - yet).
Two additional tips on gear storage:
Eagle Creek makes all kinds of small mesh and cloth bags that are perfect for cords, cables, extra memory cards, plug adapters, etc., take a look here:
http://www.eaglecreek.com/accessories/packing_cubes/
To keep all those cables organized I use Velcro "get a grip" straps that are available in almost any hardware store and lots of other places - here's a link:
http://www.officemax.com/omax/catalog/sku....category_Id=795
By the way, if you put a lock on a bag - make sure it's tsa approved so that your bag can be opened for inspection.
Hope this helps
masguy