Enchantments not on villiagers in snapshot need ways to more consistent

With the new snapshot villager changes are taking effect notable removing a / the major way to get channeling & crossbow enchants used for many (or some) advancements & general utility. My guess for how to fix such would be to add ocean villiagers (or more biomed villiagers since they are more relevant with this change) or improve enchanting some way.