Problem solved guys, I added a 2 mm brass retaining ring to the tail-cap, scavenged from a Chinese P30/60 clone, and I solved both issues:
1. No more extra pressure on the springs and cell.
2. Fixed the issue with the spinning clip since I was able to add the two o-rings as designed for...