Yeah, the whole thing is just crying out for an AU where they come up with a better (read, faster) solution and Daystar gets to grow up with both his parents, and possibly a sibling or two as well.