Curing Witches, Drowned, and helping the proposed experimental changes

If the experimental changes to villagers are determined to be the ideal future (the community generally seems to hate the idea) then I suggest something small but overlooked be changed to help balance.

We should be able to cure witches. Initial concern might be about how the witches spawn fairly frequently from their huts, and that might make it too powerful for the player to be able to turn them all. My argument against that is to then lower their spawn rates outside of swamp huts.

My proposed witch cure would be that they need to be struck with lightning again, maybe while under a potion effect such as weakness like with zombie villagers, and they become a villager of the biome they're in. This limits the time frame for changes, and introduces difficulty.

Letting witches, especially from their huts, be turned back into villagers would let players be more reasonably able to populate a swamp village in general, if the village based books stay. However, I would suggest that there be a tag that marks villagers who were originally witches, and that no matter the biome, if a former-witch becomes a librarian, they should be able to sell mending. That also makes it doable for people who play super flat.

To a lesser extent, I think the game would also benefit from a way to cure drowned, maybe by introducing drowned zombie villagers, by drying them out and then a regular zombie cure. Perhaps if a former drowned becomes a librarian, they can sell the trident enchanted books?

Thank you