Have you been tested for gallstones? If you don't drink or have spicy food, does it still happen?

Could you be getting gas under the rib? Trapped gas can hurt like crazy..Maybe you need to keep a food diary for a weekand see if anything else triggers the response..Right now you notice the pain with wine and spicy foods, maybe it's not so bad with other things and you notice it less..

It sounds like gall or liver, either way you could put yourself on an alkalizing diet, look up acid alkaline diets. The water is good just be carefull you don't deplete your body of minerals if you are drinking a lot. you can replace the minerals by using unprocessed sea salt which will also help your pancreas & stomach function better & allow a increase in absorbtion of nutrients, the best way to take these salts is througha liquidised solution called sole(sol-ay), if there are gall stones they can be disolved via using borges organic apple cider vinegar(i think it is in your country), also lecithin & flax oil lowers the melting point of cholesterol from 149degF to 0degF, some gall stones are of cholesterol, this will also help reduce a fatty liver. So between the three of us so far you have a few more options.
Keep us informed, hope these can help!
God bless!