The only fair solution is to drop the Wave shields out of the game and replace them all with Tidal Wave Shields. The people who upgraded their swords are the ones who lost out the most but there are also some people who opt to not upgrade the sword only because the shield didn't come with it. Personally, I don't think this is that big of an issue but since people love to whine about everything, the only fair solution is to change all Wave shields to Tidal Wave shields and just drop Wave shields from the game.

An alternative solution is to give all those who upgraded their swords/wands a free Tidal Wave shield. While not as fair as the first option, at least no one truly gets screwed over.

Its kinda ironic that the people who made the less intelligent choice (yes, upgrading ur shield first is less intelligent) got rewarded. Also, Axlle10 is probably someone who upgraded his shield and Shantzu is someone who upgraded his sword.