As the title says, switching the drop locations of these frames seriously needs to be done. It just makes sense. Make the water frame drop from the water/submersible planet, make the frame with day/night modes drop from the only planet with a day/night cycle. Why does it not already work this way? Could even have the drops for her parts correspond with the day/night cycle, which would make it less tedious.
You've never done Adaro stealth runs, then.