Sounds good. We can firm up plans a bit later, but should be available for at least some of your stay. I am trying to get my sailboat back in the water this week, after a 3 month rejuvination on the hard.
There are some good dive shops in Pc that can be helpful.