yeah, I find that if you do not use something on a regular basis, having batteries in the shop only leads to annoyance in the long run - they always runout when you need to use that tool. with the exception of 1 tool (cordless drill/driver) I am battery-less and replaced all tools that were cordless (batteries) with corded version, or mechanical version (calipers). one less thing to worry about.
As for the batteries in the tools. what I used to do is similar (remove contact from batteries when not in use) I kept a piece of paper in the tools between the battery and the tool contacts so that when not in use the battery was not making contact with the tool circuits and thus 'not used up' then when I wanted to use it, I just slip the paper aside. this way the battery is always with the tool and I don't lose them.
As for the batteries in the tools. what I used to do is similar (remove contact from batteries when not in use) I kept a piece of paper in the tools between the battery and the tool contacts so that when not in use the battery was not making contact with the tool circuits and thus 'not used up' then when I wanted to use it, I just slip the paper aside. this way the battery is always with the tool and I don't lose them.