Light problem

I have a SF 6p bored using a UltraFire 18650 2400mAh Bat with a M60 from Gene.
Only recently it has start to not light up when I turn it on. It works fine with Cr123s. theres a weird click/grinding sound in the tail clip when I turn it to safety but the battery also doesnt light up Olight M20 warrior premium but lights up my p7 Mag. I have try draining the bat and recharging to make sure its full. but I get the same
result the next day. I've only had this bat for about 4Months is it at its end? or is there something up with my tail clip? any thoughts?

It sounds like the protection circuit is kicking in prematurely.I've had problems with Ultrafire 123s doing that as they get older. I have since ditched them and spent the extra $ on AW cells.

That would make sense, I have an AW 18650-26 on the way so it should be good to go