Hey train_ga,
Friendly Reminder: As you learn to use your new rig, please be especially cognizant about not harming the coral. I'm not saying you won't be, but, I've seen a lot of photographers trash coral to get a picture when they could find about 20 "better" photos with a google search off the internet of whatever object/fish they're trying to shoot -- especially with a new camera.
In my experience, about 20% of photographers do an excellent job of not harming the reef, 40% are ok, and 40% should have the cameras broken over their heads. Its the last 40% that really annoy me (pet peeve).
If you're training with Tim, I've heard he drills buoyancy control into his photography students.
I'll be down at CCV in 4 weeks. Good luck with the new rig.