Yes, it is very common for these batteries to be over rated, sometimes horribly.
Well shoot, and here I thought I was being clever. :\
Oh well, back to hoping an 18650 will fit under my switches.
It looks tight on paper but with the extra quarter inch of the box and the shorter illuminated switches it should be possible.
Bookmarks