They will probably keep it the way it is and introduce new jobs from here on out. This is the most sensible way to deal with this.

As for the utilization of classes at end game every single class is objectively worse than their job counterpart and this will be exaggerated to a large degree after the expansion releases when they have given people new job abilities making them even better than they are now.

Aside from lore and basic cross class skills the classes are useless. There will be no new cross class skills and all skills will be attributed to job crystals.