I think your proposed alternate ending is actually really similar in spirit to the actual ending. A major theme of this series is how much “the industry” basically grinds these people up and spits them out, a broken version of themselves. The series ends, in broad strokes, the same place it began. So, having Aqua turn out like that still would work with the theme I think.