So, I had an idea, to avoid confusion with sentient armour and tools. It would involve the user being able to set which specific types of will are being used to empower them. There are two ways I believe this can be achieved:

1. Through an item. While holding this item, if you right click, it will open a small inventory where you can place crystals. These can be separate items for both armour and tools. When holding the item, it will cycle through crystals you have placed in it, changing the icon to show you which one is selected. This switches all sentient tools / armour to that will.

1.5. This can be done also just using the tools, but would be annoying to change the armour also.

2. Through hotkeys. You press a hotkey to cycle through the crystals, etc. In modpacks, this would cause an issue as keybindings are normally full anyway.

Suggestion/enhancement. Being able to lock in a specific will type would actually resolve other existing issues.