Making the ending a 50-60 minute 'special' is not a bad idea. Although there is still ep 49 and 50, which focuses on a completely different plot (with one of the only relations that Astro was damaged from the war in the Robotonia episodes). They could even make it two 'specials'

And replacing Dawn of the Techno Revolution is a good idea, but impossible since the original has 'Eternal Boy'.