Technology should evolve in the scuba industry to help avoid buoyancy and air supply problems.
I predict a future of BCs that provide semi-automated buoyancy control based on your body makeup and water depth. Sort of like the "lane assist" feature in some modern cars. The BC wouldn’t be fully automated, but it could help make slight adjustments to keep you steady.
And computers/regulators that manage the air supply to help prevent from low/out-of-air situations. Maybe the reg can release some nasty tasting air once you get too low, which would encourage you to finish the dive :) Or a computer that starts to vibrate erratically and doesn’t stop until you ascend. Or maybe the buddy sharing dive computers will become standard so you can see your buddy’s air also.