I don't think Orson was ever planned to be dealt with, because I think he was just misdirection to make Danny's death at the end of the season more shocking. (There is the possibility that we see him because at the time Clara and the Doctor left 2014-ish Earth Danny was still alive, but that might conflict with other depictions of time travel in the show.)