Everything points to it happening. Specially considering the current format of the song.1,2,3 with Rika Matsumoto and Daiki Yamashita please
It's not even an "would this happen?" and more of a "when is it happening?"
I just hope for a Goh-focused ending sang by Daiki Yamashita just so Goh could have his own song.