I think it's about time to add weapons to a few loot tables - at least where it makes sense.
For example, they should NOT be available in dungeon chests as they also cannot contain Vanilla tools and weapons.
On the other hand, end cities SHOULD be able to contain them (maybe even with enchantments)...