Also for option B, and I would add that it could be linked to initiatives that attack specific user segment or contribute to accomplishing this goal in a specific way.

As for goal A - the generic part seems like part of a vision, not objective (goal). And here I think aha! could provide a little more in are of connecting vision to goals.