We are doing the 12 day from Panama to San Diego, a lot of the same ports. Read good reviews on Odyssey tours 10 in 1 Puntarenas. We have booked this for our trip and will comment after we have done it, a full 8 hour excursion with all the major hi-lites.
Also are doing whale watching in Cabo as the timing is right.