Suggest Treatment For Stress Release

I have a problem concerning my foreskin.Although it is not a health condition it has been causing me a huge amount of stress and any advice would be greatly appreciated.The problem is my foreskin makes a really loud clicking noise during masturbation (similar to clicking your fingers).It is caused by a fold in the foreskin under the head of the penis which makes this noise when my hand runs over it.I really need this to stop as it is preventing me from having a sex life due to the embarrassment it causes.I would like to know if there is a way which i could have some foreskin removed without being fully circumcised ? Thanks in advance