I think the +3 upgrades should have been another 15 geodes. No more than 20. 40 is just excessive for how little the weapons are boosted.

And, if you value your sanity don't go out with the intent to farm geodes. With almost constant weather and a THF helping for a bit, I got 3 in a couple hours. With just day none for the whole game day. I actually have slightly better luck with WoE coins than geodes. Only problem with that is, a WoE weapon doesn't help my pet's PDT or help my own evasion.