I have one X2 that hardly ever works with 5 clicks. Sometimes it takes 6 or 7 or more to get it to turn on/off. I don't know if this helped that particular batt or not, but I vaped it all the way down till it was blinking ("charge me, charge me"), then let it sit for 24 hours before recharging it again. Before I did that, I think I counted something like 452 clicks once. Now it's down to an acceptable 6 or 7. And I hear you - no big deal when you're at home, but try turning the dang batt back on while you're driving!

If it's still under warranty, I'd contact CS and swap it out if I were you. I'm still not feeling all that confident with that one batt that I decided to keep. The problem I'm having with it now is that I'm not so sure it's holding a charge. I don't use it much, but when I do, it's usually dead, and I could've sworn I charged it before I put it in the drawer - whereas, my 78s sat in the drawer for months and months, and were almost fully charged when I used them again.
Just sayin', if it's not working perfectly now, you don't want to have future problems arise after the warranty runs out, even if you're able to somewhat fix the existing problem now. You just never know what new problems it'll have after this one.