Ideas and suggestions.

A rebalance of spells/secondary skills is planned (and has been for a while). In 1.6, it was decided to include what could be easily implemented and didn't depend too much on other changes.

Excellent. I'd like to see it happen sooner rather than later. Right now, there's essentially only one template that everyone is striving for, in one form or another. It's getting a bit boring. :(

However, if you start reworking everything at once and making significant changes, you might encounter a lot of misunderstanding/resistance, as well as create a bunch of new balance issues and bugs.

Pay attention to the leadership and water skill buffs and the synergy between them. This will immediately solve a lot of problems for warriors and force mages to develop differently.

After all, warriors often acquire leadership and water skills, but these skills don't end up being very useful. Leadership is good against mobs, but in the endgame, it's easily countered by a single artifact that prevents morale. And even if that artifact isn't present, morale might not even work (it's just random). The skill needs to be made more reliable and understandable.

As for water, it's simply useless, except in a few very rare cases and for certain heroes.