I still think Lance's/Red's theme from the GSC, HGSS, and B2W2 games would fit so much better. especially since you play as red in the first games (but it used the Yellow version party), and you basically fight yourself from the old game, who is now a serious badass and happens to be the Kanto champion and strongest trainer to date