I think what the Fighter really needs, Is to not be THE Fighter, trying to be none and all of the archetypes at the same time, it needs to be divided up to specialise in different areas, my choices for how to divide it up would be as The Brawler, The Weaponmaster and The Knight, in a power, skill and defense specialty for each respectfully, they each also get a mental stat to focus on as their secondary.
The Brawler: A streetwise powerhouse, kills things good by hitting them-alot and with bonuses to damage, the champion fighter of the three: simple but efficient, WIS secondary represents them fighting smart or dirty, outside of battle they have the ‘bend bars, break crates’ style of fighter features but also proficiency in things like perception, insight, intimidation and acrobatics, with some features based on those things too.
The Weaponmaster: knows how to use all the weapons to their fullest and many techniques for them in a fight, the battlemaster or eldritch knight of fighters with special manoeuvres to use, INT secondary is them being highly trained but also educated on their foes and how to take them down, gets more skills than the other two outside of battle, athletics, history, nature, survival, arcana, has skills to study and research their foes or environmental from books or in battle for bonuses on them.
The Knight: doesn’t deal the most damage but will be leading the charge and blocking incoming attacks all day and protecting their allies, they’re protectors, the guy with shining armour and a reassuring tone of voice, CHA secondary to show how they lead and inspire teammates, able to rally crowds for their cause and win over the hearts of the people getting help from them, skills include persuasion, performance, medicine, animal handling.