No, there won't be much need to rework the branch. Just make it so that choosing the corresponding skill enhances the spell, which can be obtained without the skill in the guild at the basic level. For example, if you need healing to clear neutral creatures without losses, build a guild and enjoy. But if you need healing to play a role in the final battles, then you need to take the skill.
Although, I didn't vote for either the guild or alternative skills: these are all good things, but first, we need to refine what we already have.