Yeah, the way I understand it is that the last world (Black/Black RX) and the next world (Amazon) are there to tie into the movie's plot, then the movie takes place (all the talking about Daishocker in Black/RX world and Amazon world kinda prove that the movie is not an AU) and then the Rider War is the ending to the series