i get where you're going with it, but i think i want to leave it as is. it allows for more options (safe sword and shield vs aggressive sword + bow or sword + wand). shields also dont drop that often (you had good rng!) so bow + shield makes sense, since weapons drop 40% of the time, so this would be the fastest way to get sword + shield + bow loadout.
thank you for the kind words and feedback!