costa rica scuba diving

Where do you recommend going for a week to surf and scuba dive in late June?
I am coming from San Francisco and would like to minimize time traveling given I only have a week. I was thinking about costa rica, but the flight scchedules are awful and traveling to/from will take the better part of two days.
What do you suggest? I am a beginnger/intermediate surfer…surfing a lot is my top goal. Convenient snorkeling and great diving would be great.
Thanks for your help.
and if you could recommend any specific websites where i can follow up on your suggestions, that would be very helpful!
San Diego
Scuba Diving in Cocos, Costa Rica – Fish Ball