My idea is to make the 2 rank classes available at the very beginning of the game along with the ones we have now so you could choose not only Swordsman but Highlander and Peltasta for example. That way you could choose an class that fits more your build and besides an obligatory class for each type of character kinda ruins the whole “huge class diversity” positive point that ToS have at the character creation.
You should use the search function, this idea was already posted and it ended up on a heated argument lol.