The Dragonfly 30 is actually just 22l in the main compartment. They count it as 30 cause you can stuff giant water bottles into the side pockets. It might fit your gear perfectly.

r/onebag is all over it