My current setup is the Olympus EM10 in the AOI housing, with the 60mm lens and a single MF-2 flash. I'm really happy with the results with smaller subjects and am sure I have a long way to go getting better with just this configuration. I also really appreciate how small the rig is - very casual to dive with and easy for travel. But I find I'm struggling with larger subjects - reef squid, octopus, seahorses, even bigger nudibranchs. It's hard to get the whole thing in frame, and at the distance I need to be I often don't have enough light. Definitely true for turtles, rays etc. I'm curious if there's a setup that can manage fish portrait of even some bigger species through to macro on the same dive. I'd definitely be fine with it not covering wide angle. I'd be happy to consider changing formats/camera bodies too. I only really view pictures digitally so don't need super high megapixels in case a compact is one of the good options. I was considering something like the 12-40 zoom with a wet lens if anyone has tried it, but curious to hear recommendations of any kind!