Villager Rebalancing Suggestions

The recently tested villager rebalancing has made it more difficult to obtain most enchantments in challenge worlds (flat world survival, single biome worlds, one chunk survival, etc.) While I think that the new system makes a lot of positive changes for normal worlds, I have two suggestions that can improve the villager system for challenge worlds.

1- Zombie villagers can spawn as if they came from other biomes.
Currently, desert zombie villagers spawn in deserts, swamp zombie villagers spawn in swamps, etc. Instead, every biome should have a chance to spawn any type of zombie villager. While villager breeding, villages, and abandoned villages would remain unaffected, anyone willing to go through the effort of curing naturally spawned zombie villagers can obtain every villager type. This would allow players in challenge worlds to enjoy the rebalancing and give regular players another way to obtain specific villagers, without needing to travel potentially tens of thousands of blocks.

2- Wandering traders have a chance to sell lava buckets.
This suggestion only impacts bedrock flat world survival. Currently, it is impossible to go to the nether or obtain cobblestone in this challenge. This makes it difficult or impossible to obtain certain blocks and job sites, such as stonecutters. With the changes to the wandering trader, it makes sense to add this trade, as it would open new opportunities for flat world players while having a minimal effect on the progression of a normal world.