For the tech market to grow, there may need to be a form of "competitive diving" that attracts sponsorship, fanbase, viewership, and the myriad commercial opportunities that go along with it. Of course, "goal directed" diving is anathema to tech diving culture. As an example of competitive diving, creating an obstruction course where perfect trim, efficient finning (don't disturb the environment while completing the course fastest) might be one means to determine who is physically the most adroit diver. Awareness is less obvious to evaluate but not impossible.
Short of something drastic, I don't see how the basic business model of churning out vacation divers will change.