The only way I can get the second movie's magic to make sense is by assuming The Void is a canon Mary Sue which acts as plot device for Sakura/Syaoran.

...which isn't far away from the truth.

Like Clow would forget his most powerful card in his house's foundation, or Eriol could forget THAT.