Why do you say "considering we have the same branches tags for components" for #2 ?
I read that as then all repos have the same tag (i.e. jbosstools-<something>) but then that brings us back to the current/previous strategy which enforces always tagging/branching when no need.