Have you seen the DiveCaddy? It rolls up your gear in a small package but wouldn’t work if you are also carrying camera gear.
I saw it last year at BTS but I had just bought a rolling duffle. I avoid hard cases because there is no place to store them on liveaboards and bags with logos that say "steal me, I have expensive gear inside!".