We twice used Baja Test Kitchen tours while on stops in Ensenada and highly recommend them. They take you to the smaller, and arguably, better wineries than the ship tours will take you to. Also, smaller tour groups, which helps. You can add lunch to the tour and they will get you into one of many great restaurants in the Valle de Guadalupe. We've recently taken a tour with BTK separate of a cruise that was spectacular. They usually have weekend tour groups, but you can contract them for a private tour as well.