Better enchantment table, remove the librarian grind

Current enchanting is, in my opinion, by far the worst part of the survival experience. Out of the two ways to get enchantments, villagers are by far the better option, and on any multiplayer server I feel basically obligated to set up a enchantment trading hall, but its painfully boring, I hate it, and I think everyone hates it. However, if you refuse to set up villagers, the enchantment table almost as annoying, and far less convenient, with there being no guarantee of you ever getting the enchantment you want.

To solve this, I think you should not be able to buy enchanted books from villagers. Instead, you are forced to use the enchanting table, however, the random aspect of the enchantment table is removed, and instead of using lapis for every enchantment, you select your enchantment based on what item you use. For example, quartz would give sharpness, and blaze powder would give fire aspect. But, this raises a balance issue of enchanting being way too easy, so to fix this, and provide a survival progression incentive for exploration, upgrading the enchantment table is made much more difficult and much slower. Instead of using regular bookshelves, you use the new chiseled bookshelf, and fill them with magical tomes, which are found in various generated structures. Using multiple of the same magical tome would give you diminishing returns, and you would get different magical tomes from different structures.