I hesitate to add more to this thread, but what the heck. As a consumer (rather than as a provider) of diving, the thoughts below may be fantasy, but here goes:
1. The basic Open Water certification should have a recommended depth of 100 feet and include training that enables diving with Nitrox. I personally don't think it needs to be any longer or more difficult -- with one exception. I agree that the swim test is pretty minimal. I would add maybe one item: the ability to swim half a pool length under water with no mask, goggles, or fins. I think that would weed out many of those who should really be getting swim lessons before they get a diving certification. I think PADI and the other agencies have made themselves and the dive industry victims of their own success in creating an extreme multi-step certification process that then creates de facto legal standards for what is "safe" that, in turn, creates issues with liability and insurance.
2. The Advanced Open Water certification should have a recommended depth limit of 130 feet and actually teach people things they might use as an "advanced" diver. For example, how to deploy a marker and use a reel, how to sling and switch to a pony, where to carry extra items on their rigs (knives, reals, markers, etc.), and basic gas planning.
3. Advocate that diving gear manufacturers (especially of regulators) make manuals and part specifications available with their products to end the "grand mystery" of regulator service and parts availability.
4. Advocate for laws that make liability waivers more clearly enforceable. If a dive operator makes clear that they are only providing a ride to the dive site, should it be the operator's fault that someone jumps in the water without adequate preparation?
5. Make diving around the country a little more like diving in Florida or the Caribbean by making rentals more available on site so that people don't have to worry so much about unloading, rinsing, or drying gear when they get home. Maybe that's not practical in non-vacation areas, but, as someone in another thread put it, dealing with gear after the dive is a hassle.
6. Be more cautious about advertising diving as a "fun for the whole family activity." It can be -- if the family are good in the water to begin with. However, part of the initial attraction many years ago is that it was cool, and even seen as dangerous -- a little bit of James Bond, if you will. That is long gone, but the truth of the matter is that there are inherent dangers to being underwater and under pressure and the industry should not minimize those.
Long rant over. At the end of the day, the success of the dive "industry" will be driven by the number of people who want to dive.