What Causes Painful Urination After Accidentally Getting Soap In Urethra?

Two months ago I got soap in my urethra while showering. Usually, immediate urination, although initially painful, has resolved this problem. On this occasion I had already urinated, and could not do so again for another hour. When I did urinate it was quite painful, and the pain seemed higher in the urethra. After a week or so I started to get a white discharge in my underwear (mornings only). The hospital (I was abroad) tested me via swab for STI s and gave me ciprofloxacin for an STI. I have not been sexually active for a number of years. This had no effect. On my return to the UK my GP took another swab and did blood tests. He initially gave me Canesten cream, which I used for two weeks. Blood tests showed no problems. Second swab (taken before first urination of the day) grew a Staphylococcus aureus infection. GP prescribed Fucidin cream for two weeks. Two weeks after finishing with the cream I am still having discharge and an odd feeling in my urethra. My urine stream seems OK, maybe a little off to one side, but not noticably affected. No pain when urinating. My GP in Holland (I work here) recommends waiting for 6 weeks to let my natural defences sort it out. Any advice?