Sorry it's been slow.

We're considering just skipping Aqua's Shadow and letting him do it via flashback later. Since Vita is the only one left technically, we're waiting for her to come to a conclusion on her shadow.