Okay, guys, I think it's confirmed—this remake will follow the manga exactly. I say this because I just checked the manga and the '80s anime: in the '80s anime, the fight against Shin took place in episode 22, but here in the remake—just like in the manga—it happens in episode 5.