Recapture should be changed to be usable on the caster (remember how overjoyed dirges were to be allowed to cast battle cry on themselves? The underlying reason to change it is no different. I went through the process of upgrading the spell, so I should be able to cast it on myself.). If it's made to be usable on the caster, there's no reason to cast it on the pet - problem solved.