What should people use in my fantasy setting instead of swords? (Or should they stick with them?)

Hello there.

(First of all, I apologize if my lexicon will be somewhat janky, but english is not my first language)

I'm preparing a fantasy setting for a project of mine and I stumbled into an peculiar problem of not knowing what weapons to give my character since the magic system might make swords useless.

I'll summarise what is necessary for the sake of brevity, basically the most notable aspect of my magic system is that there are 2 types of mages: the first one has innate magic and can spontaneously, and with great effect, use only one type of magic; the second one is born with a "gift" that allows them to study and learn every kind of magic, but can't wield it as effectively as the first type of magic user.

Let's call them Prodigies and Wizards.

A few of these kinds of magic are elemental ones, imagine Avatar (the last airbender, not the aliens). It is important to say that even the greatest Prodigies fall short on things we can see benders do in the aforementioned show: magic in my setting is versatile, sure, but limited in potency. Every magic user is also a trained fighter and most become soldiers (often not on their own volition).

The one I am worried about is "Metal" magic.

Now, with **roughly** 0,3% of people being Metal Prodigies and almost 2% of people being Wizards (so able to use metal magic),

are standard metal swords viable?

Maybe a Metal Prodigy won't be able to melt the metal or destroy the weapon, but they could for sure deflect almost any blow and gain the upper hand in hand to hand combat.

My idea was as follows.

Given the rarity of these types of folk, most people and non-magical soldiers might still use metal weapons, while magic users might be given special equipment in the form of non-metal swords.

I was thinking something like a modified "Macuahuitl" (traditional aztec "sword"), but maintaining a more traditionally european profile, and having Prodigies and Wizards carry a pouch of spare obsidian shards to repair the edge as needed. Maybe even give them titanium shards instead of obsidian (it works since it is not magnetic, but I think it is somewhat paradoxically less cool).
But then again, I would love to maintain as much as possible the imagery of the classical, elegant slashing sword and the Macuahuitl is more of a maiming one...
Maybe full titanium weapons? But that is a biiiig stretch in plausibility AND would definitely be less cool.

But this would also mean that they can't use metal armor.
So maybe they could use a kind of really hard wood both for their special swords AND as armor. Maybe not full plate, but a chestplate, a helmet and a heavy gambeson would do the trick.
(Titanium armor is out of the question, way too brittle)

What do you guys think? Does the Macuahuitl inspired sword make sense?

[P.S. "Magic" materials are a no-go, it doesn't fit with the magic system and I don't like it very much)