I really don't see a sword as a central aspect to him.
Of the times he's in his human (Gerudo, whatever) form:
-doesn't use a sword in OoT (only used in a SpaceWorld Demo, though admittedly, that sword is frigging beast)
-uses a pair in WW
-begrudgingly uses one in TP (he hates the sword since it was used for his intended execution; he only uses it to smite the gods by having their blade cause innocent blood to spill)
Now, I'm not saying that super strength is more of a central aspect, but I personally feel pounding at someone with his bare hands fits him better than using a sword (unless it's the SpaceWorld/Melee sword).
So I'd rather see him keep the style he has shown in Smash, but be changed up to be less like Falcon through means of wizardry (since he is a warlock).