Corey, we were on Ecstasy last October -- had a wonderful time. Excellent nightlife. Our favorite club was the Neon one, which is like a piano bar.
I also had my best cabin steward(ess) ever -- Ylena, (Of course, she said we were the cleanest people she's ever had) :-)
On Catalina, take the Casino tour, or just rent a golf cart with another couple. If you rent before noon, you get one hour free -- so 3 hours for $80. We saw everything within that time -- even stopped for photos, walked around the Wrigley Gardens, etc.
The Bufadora trip is fun ... get to see a lot of scenery on the drive, and it's more insualted feeling than downtown Ensenada.