Honestly, the faster fix to the problem with warrior is to just give players enough resources and space to deal with two different materia configurations for tanks...

Actually now that I think on it maybe that's the harder one to implement.