Village Gen + Missing Villagers

Any villages discovered have weird gen issues, fractured villages, going up and down on levels. On top of that, there's only one villager spawning in any of the villages I find. Note, I am playing the regular version, not insider beta - but I do have experimental features enabled.

In the last picture, with the water, I noticed there was 5 or 6 zombie villagers in the water. Perhaps because of the world-gen bugs, the villagers are being spawned somewhere outside the village and being transformed into zombies?