Olympus 60 vs 30 Macros

Ah- low viz west coast diving   As far as going with a shorter adapter- I agree, and personally I don't do supermacro with my 50 yr old eyes.  The thing with the 30 is that it does give you some flexibility for medium sized stuff- it's really, really good for cooperative rockfish portraits, anemones, etc. 

You'll like Puget Sound- places like Hood Canal and other protected areas are just so dang easy after surf entries.

We dive the Channel Islands and Palos  Verdes quite a bit, mostly looking for nudis. I have all 4 lenses (OLY 30, Pany 30, Leica 45 and Oly 60). I think the image quality of the 45 is best  but if we are finding really small nudis (Porter's, Macpherson's) I will use the 60 with a CMC2 for getting them full frame. 

Bill