As Craig suggested you should consider the Sigma 15mm FE as well. I shot with this lens on 6 dives last week and really liked it. Its pretty wide so it really forces you to get close to your subjects.
I'm planning to get the 10.5 at some point but for most shots I think it would be too wide. Its difficult to fill a pleasing percentage of the frame with this lens on most subjets and its hard to keep other divers out of the frame. I think it would be awesome for wrecks, whalesharks and reef scenics though.
I think the 15mm is a better compromise. I also use the 12-24mm and the flexibility is nice but nothing beats the simplicity and sharpness of the prime. I probably would have shot the 12-24mm but twice the divemaster sucked me in thinking we would do a wreck dive that never happenned.