Yep, this really uses this timeline better than G-Witch itself. It really looks like a full blown Gundam without any buts in this version of the story.
For those confused on how Yoshika ended upunderwater, the final blow Kiyu struck against the Anavata not only broke it through the dam wall and decapitated her, but also did enough damage to breach the top of the torso portion of the Anavata chassis, which left it exposed for the cockpit to be flooded with river water from the now-breached Hoover Dam. This results in Yoshika being washed out into the dam basin.