Is there a way to turn a witch into a villager?
As it stands now, no. There is no way to reverse a struck witch or a naturally spawned witch into a villager. The wiki specifically says that when a villager is struck it is despawned and a witch is spawned in it's place, only giving the effect of it turning into a witch.