Oh man. Donna didn't deserve all this meddling with her backstory. Honestly the only solution at this point would be to go full meta and make every single Donna Troy origin canon simultaneously due to some Time Trapper/Dark Angel shenanigans. Face it head on and embrace Donna's convoluted history.