I did a course with Nam from Breath Enhancement Training
http://www.bettraining.com/home.html a couple of years back when he came over to do a course in Fremantle. Highly recommended, tailored specifically for surfing and left with a decent training program. I wish I was on the east coast so I could be be doing regular sessions with them.
Freedive courses, did the course with Erez from Apnea Australia,
www.apneaaustralia.com.au/ , super knowledgeable, big emphasis on safety, everyone hit 18m by the end of the course. It's a bit exxy but I will be looking at doing the Stage B course in the future once I sought my sinuses out, his knowledge is invaluable.
In Bali there is Apneaista in Ahmed(near Tulamben), nice spot, drops off the 40m+ within a couple hundred metres of the shore.
The BET course made the greatest impact on my surfing, freediving involves similar concepts but is obviously not specifically tailored for surfing.