what are the episodes or range of episodes where connan turns back to shinichi ? Is there a movie where this happens as well?

Episode 48-49 Diplomat Murder case,
188-193 Desperate Revival
521-523 Murderer Kudo Shinichi
616-621 Holmes' Revelation.
movie 7 Crossroad at ancient capital.
That's all I can think of at the moment so I'm not sure if I missed any, and also there is also some flash back episodes with Shinichi too, but i didn't list those.