Better level for the last enchantment of the booksellers

A while back, the new experimental feature was introduced, with the aim of balancing the most broken trades in terms of gameplay and progression that the villagers presented since 1.14.
I come to make a request that would alter a small point, and that is the last special enchantment that you can get with the library of each biome.

My argument is that you will have to explore long distances in your world to get all the enchantments (so far so good), my problem is that when you get to the librarian in each biome, and level them up to max level, most of the enchantments can't be maxed out.
And my problem is that to get that enchantment to max level (I'll use the example of the Efficiency enchantment), you will have to fuse four Efficiency 3 books on the anvil to make Efficiency 5. This causes problems, since the anvil has a 39 level xp limit, and it can cause problems, having to fuse multiple books, not counting other enchantments, naming or repairing an item.

My solution is the following 2 options...

1. Booksellers sell you books at max level:
This way you can solve the problem without changing the anvil mechanics. You just have to have a villager give you the enchantment and then not have to merge and merge until the anvil no longer lets you.

2.Remove the anvil's combination and xp limit. (Leave the villagers the same)

The limit is removed and in this way players will have to explore, also having to collect xp to enchant dozens of times without problems on the anvil.