This is really, really late, and isn't really important since this is just the music, not the story, but I think as far as pacing is concerned, a wiser decision for the script of the movie would've been to leave in an initial trip through time rather than jumping straight into the saving the future mode, and instead cutting the Masamune story (or putting some variation of the Masamune bit at the start if it was considered absolutely necessary.)
It's just a deal of pacing and characterization is all; just wanted to mention it since it was on my mind after looking over things . I can't wait to hear the full soundtrack.