For those interested in other sports that will help your diving fitness, Underwater Rugby starts up again this Sunday at Henderson West Wave (5M dive pool). First time is free and you will get a solid hour of training / game time.
Take a look at http://www.youtube.com/watch?v=HKFJirV5voE for some footage. Time on Sunday evening is usually 5pm - 6pm but it does change occasionally to fit round swimming comps etc.
Drop me a line if you want to know more.
Or, for more footage - look at this: http://youtu.be/WlFRGSvpfHI