Short but great episode, the fast paced events made me felt like I was on a rollercoaster and it was over before I knew, though it'd probably keep me hyped for a while. Anyways on topic, for father and son, I think Solaris and Taka arent bad to the heart, well no one is as they have their own ideals but I don't see those two be an enemy until the very end. The same way Taka is bound to blood and fate, Solaris is as well. Maybe as the story progresses we can see Taka defects and manages to get away, then eventually Solaris splits against Lin. Fighting him back there to give him an excuse to be no labeled as a traitor (yet) was correct.
Now next, fixing the city by starting at the water is a good idea. I can sort of see the entire city being fixed without cracks in the ground and the water being blue and finally surfable on. (This will require a grand effort from Ame and the development team, so cheers in advance for them). Then again, if it's going to be destroyed, it might not be completely destroyed or the Citae Arc-d'Astrae sticking out from the grand stairway like in XY.
Either way this episode has been a blast, I was noob and lost to Solaris the first time so I got paired up with Flobot, and boy does she like to spam EQ and killing my Pokes as well, I mean, really...why...