While this does not solve your entire problem I use a REI Lookout 40 pack (REI Lookout 40 Pack - Men's - Free Shipping at REI.com) that easily fits my BP/W, regs, mask, booties, a set of shirt/shorts, and dive computer. It is smaller than a lot of roller carry on luggage as well so I have never...