We went dolphin and whale watching with danawharf.com last month. Liked it so much we went twice. Check their website they also have daily sportfishing tours. My son also wants to go catch a big fish next summer.
I should add they are located at Dana Point. It was about 35 minutes from Anaheim. Easy to find and no parking fees.