You touch upon the key factors here.
I may be a novice photographer, but I am certainly not a novice diver. Even with more than a thousand dives under my weight belt and having taught many classes on peak performance buoyancy, I was amazed at the level of difficulty involved in keeping trim, pitch and yaw and position under control whilst manipulating an unwieldy, slightly buoyant box, getting my brain to compensate for the different refractions between eyes, camera display, lens and subject, let alone calculating for lighting, exposure, shutter time and whatnot.
Adding an electronic viewfinder to my camera was one of the best decisions I made in terms of underwater photography, since it eliminates a lot of lining-up issues.
Here in Belgium and Holland, focal length is less of an issue than it is in tropical waters. Wide angle is mostly impossible due to bad visibility, and most subjects are more or less indifferent to divers (think lobsters, crabs, nudibranch). Getting close is generally not where the difficulty lies.
Tropical waters are another kettle of fish (excuse the crappy pun, please) altogether. On holiday, there are not only photographical issues to consider, there is also the buddy (aka my wife) to consider, since her navigational skills are somewhat less than nonexistent. There is the whole diving in a group with a guide thing (though most guides keep an eye on photographers) and there is the abundance of subjects and possible approaches.
So I'll leave off the lens experiments for a while and focus on mastering my existing kit and on bettering my photo skills. Maybe in a year or two I'll have gotten to a point where I'm ready to start sharing the results with the world.