My guess is that it was River who brought Strax back. Also agree about the fairy tale solutions, although for a Christmas special it works.

Could Clara be the Doctor & River's kid? It's been hinted that he had children.

Fair play!