I think they should have some more swords. OoT and MM handled this well and made the different swords interesting, except for the Fairie Sword from MM - that was just unnecessary.

I honestly think we should take a break from the Master Sword, unless they mix it up a bit.