Maybe try putting you weights in your BCD which would have the effect putting more weight on your upper body, as for the Air issue every starts off using the air quite quickly on a dive as you get more dives under your belt you will improve your technique and relax more.