I hate licorice tea with passion - not just straight licorice tea, but even a tea whose recipe (formulation) has a loooong list of ingredients with licorice being at the end - I still sense the presence of licorice and would not drink it. So at least this confirms that one might get orgasm headaches without licorice. You still might have gotten it from licorice, but that they can happen without it is for sure and I have decades of experiencing them from time to time to prove it.

Mineral water varies a lot by mineral content and in the past some varieties were actually used to treat medical conditions, including kidney stones, but that was a while ago. The content of mineral water varieties, at least on mineral water coming from Europe where mineral water used to be a cornerstone of medical treatment, not only varies a bit, but sometimes varies so much that the effect of mineral water A is the opposite of the effect of mineral water B.

That means that if you like mineral water, there might be a variety on which you would do well, but if you do not want to risk further damage, experimenting without dr's input (urologist's input) won't be safe. Unfortunately, American drs are usually not trained enough to give advice on mineral water, so pretty much this means that you cannot drink it anymore.