We finally got the confirmation that the ultimate tag tournament arc is a different timeline!Kinnikuman doesn't recognize Great III. He mentions how besides Kamehame and Terryman, he can't recall anyone else wearing the Great mask.
I think Kinnikuman is the series where retcons aren't a problem because Wrestling is built on retcons. And the duo know how to sell storylines.