Almost correct. Setting $W(h)=0$ is wrong (but inconsequential for the solutions). Checking the SOC for completeness should be included, but is somewhat obvious here. Correctness of 3. holds only under the assumption that the consumer owns no shares of the firm, which seems to hold in this exercise.

Only top voted, non community-wiki answers of a minimum length are eligible