Don't take the KH3DS tech demo seriously outside of being able to play as Sora and Riku. They could be in their KH1 gear just to show off the 3DS graphics but will be in their KH2 form in the actual game for all we know. The fact we go to different worlds also disproves your theory TC unless...