The problem with putting all the eggs in the habitat basket is that unless harvest is curtailed so that more fish can spawn in restored habitat, you will end up with rivers without salmon. The other problem, assuming recovery is somehow achieved to any extent, is that under the current management paradigm, any additional fish will go straight to commercial markets, leaving our lovely, restored habitat devoid of spawners.

So yes, fix the habitat, but don't forget to fix harvest, too. Nothing will recover salmon unless we stop killing 90% of them every year. Fish are habitat, too!