Simple solution for jedi

Jedi Knight Revan:
Skills with "jedi" tag changed to "OR jedi"

Visas:
Give her OR and Jedi tag

So you still have a team with 5 OR jedi and feel free to rework those GR jedi without breaking the game.

Edit: spelling