I was there a couple of months ago. Try to get to Anilao by Batangas (2 hour banca ride).
Club Ocellaris was wonderful. No time limits on dives. You can go in the shallows and stay down for 2 hours or more if you please.
Great Muck diving in Anilao.
check out my review http://scubatripreview.com/index.php?option=com_content&task=view&id=30&Itemid=48
Enjoy