Well, I haven't seen the episode in a long while, and my Japanese is okay at best, so I'll need a bit more time to get around to that, and even then I may not have an answer, so hopefully someone else will.
But as for Heiji and Saguru, that's a mistake I notice way too many people make, regardless of the number times someone tells them. The movies are not canon, therefore what happens in the movies has no bearing on the series. Meaning:
1.) Heiji never met Saguru until Detective Koushien
2.) Kogoro never won a Mustang
3.) KID has yet to announce he knows Conan's secret
4.) Sonoko has never changed her hair even slightly
5.) there is no BO member code named Irish
6.) none of the other stuff that happened in the movies and would make this post break character count, therefore won't be said here, ever happened.
The movies aren't even written by Aoyama and he has yet to acknowledge any of them in the manga (anime I can't say for sure, having not seen every anime original).
"I'll be filled with joy if he's still alive. Then, I can kill him again." - Gin