How about this: The sapper works slower when the spy is hurt, but it takes 3 hits instead of two to destroy manually. If the spy is dead, the sapper will destroy itself. Perhaps a downside could be that it needs to recharge, making it bad for sentry nests but good for seperate engineers. Also, to balance the weapon even more we should remove random crits.