Shipuuden Movie (Dis)Continuity

Anyone else ever notice that, at least according to the anime continuity, the first Shipuuden movie can't have happened? Here's the problem:

• The first few episodes of Naruto: Shipuuden have a bunch of scenes where Naruto sees various people from Konoha for the first time since he left on his training trip with Jiraiya. Since some of the same people show up in the movie, this clearly places the movie after the beginning of the second series.
• Naruto obviously doesn't have Resenshuriken or elemental combination techniques yet, so the movie would have to be set before the Elemental Trianing arc.
• Time passage in the movie is pretty vague, but it definitely seems to cover two or three days between Naruto's rescue of Shion and the final confrontation with the big bad. Add in a couple of days travel time in each direction and that means we need at least a week for the whole thing to play out.
• However, if you watch closely you discover that the anime meticulously accounds for every single day of Naruto's time from the moment he returns to Konoha until around the time he finishes the elemental training. The way the story arcs overlap the just isn't anywhere you could stick in a week-long excursion to demon country.

Since Indomitable takes place in the Shipuuden timeline, and Shion is going to play a significant part in the story, I guess I'll just have to cram it in somewhere and modify the surrounding details to make it fit. This isn't hard to do since the overall plot isn't tied to any particular calendar dates, but I don't want to hear any complaints from continuity sticklers who think the movie fits better in a different spot.