Check with your estate planning attorney, many states let you keep a running list and treat it as part of your will (the "little old lady" list, so named because older women will often make such a list about their household treasures and up date it as friends die or younger family members go in and out of favor with them)
With such a list, if allowed in your state, you could direct that your guns, ammo, and shooting equipment be given in accordance with "the list entitled 'Gun Will List' located in my main gun safe", with strict instructions that if any transfer is illegal the executor will..blah blah
Then all you have to do is update the list every few months, and leave it where you said you would, and you are all set.
Why are you making a will? Has anyone discussed a inter vivos trust with you?