I'm not sure about the building yet, right now it's not that important.
Another problem with starting Squirtle off with Surf is that you could completely bypass the Dragonite/Brock and Misty event. We dont really need that :S
just a suggestion but because the first movie was so short maybe you should smush
mewtwo strikes back and pokemon 2000 together