Well, you should have had a great time in Guadalupe, I was there right after you, October 2009.
Isla De Mujeres in Mexico would be my suggestion for Whale Sharks.
I was there in July 2009 and we saw over 150 in a couple mile area. It's kind of fast paced, snorkle only, 10 minutes at a time...