Strangely enough, I have a cure
It is kind of drastic, so be careful.
Cure: Join the military. Really.
You will have to urinate with people actively watching you to make sure that it is your urine going into the bottle.
For several weeks you will urinate at the same time with as many as two dozen other men.
It cured me, it can cure you too.