OP, you probably have all your plans set since you sail so soon, but for anyone still researching their Baja cruises, I just got off the 4 night March 23rd sailing. I booked a 3 hour Eco Tour directly through the Catalina Island Conservancy (I believe the 2 hour tour is offered as excursion CKI24 through Disney - booking direct will save you $$). The meeting point is about 5 minutes from the dock. I really loved it...even though it's clearly for tourists, it felt less touristy than staying in Avalon. The views of the ship were gorgeous! In Ensenada four of us booked a private wine tasting tour with Josh at Baja Vino. Cannot recommend him enough. The Valle is absolutely beautiful & he knows his way around it! Split four ways, doing this privately was basically the same as booking the Wine Country tour through Disney & gave us much more flexibility.
We had Golden Mickeys night 1, Frozen night 2, a Hoppers showing/Pirate night night 3 and Disney Dreams night 4. No drawing in Animator's.
Have a blast. This cruise actually far exceeded the expectations I had going in!