Wow, I hear that kidney stones is one of the most painful conditions known to humankind, I am sorry to hear that you have them. But then sodium/water balance is probably the underlying cause for you, as your body will attempt to leak water into your tissue to raise the sodium levels in your blood :/

I had a bad toothache and had to wait until my favorite dentist could schedule an appointment with me, during which I lived mostly of dairy and my sodium/water balance was all over the place. I mistakenly thought that eye puffiness was mainly caused by too much sodium and so, I cut down significantly on sodium. My joints also started feeling sore, another side effect of sodium/water disbalance. A dietist suggested that I should try eating a little salt and see if it was better the next day. It cleared up completely.

I am not sure how you can balance your levels better since you both need lots of fluids and low sodium. If you are used to keeping strict routines, you can perhaps adjust some of your intake to reach a better balance but definitely make sure to always get those daily 1200mg. I have heard that Parsley can help the kidney with flushing out fluids, decrease calcium excretion while raising the acidity of urine, perhaps you should talk with your doctor about what might help you take care of both your kidney and your sodium balance. I hope you got some additional inspiration for how to achieve your goal, at least you can stop trying out different skincare products if they don't seem to do any difference for you anyway :)