I'm running into issues on my LS6 build where the speaker is getting somewhat smashed when i screw the pommel in. I've concluded that either a: the speaker is too thick or b: the battery is too long. I'm using a 3w 20mm speaker (its rather narrow) and a DM Sony Li-Ion 18650 3.7V 15A 3120mA battery. would a 2400mA battery be significantly shorter? I didn't see dimension information on the site, thoughts?