You didn't mention if you are locked into a 7 day, but if you can stretch it to 9 days you might consider Carnival Spirit out of San Diego: they do an overnight in Cabo San Lucas which would give you plenty of time to enjoy the water sports; and Cabo is the best place for them.
|