Hi, have you checked devices electronics in anyway for higher voltage? 3v vs 4.2v? Is switch working fine? How long 18650 lasts? I hate button batteries in this usage, they last just around 4-6 weeks.. This would be great upgrade. I'm also considering using 3v ac adapter.