I did a lot of research into kidney stones a long time ago, but have forgotten a lot.
There are two kinds, and one can be dietary affected and the other not. And I do remember neither is affected by calcium, even though people think that cause they eat calcium.
Can you not see a urologist? They could insert a stent to make it easier for the stones to pass, if nothing else.

We are, oddly, having a kidney stone issue here in the house, but it is because my husband's MS meant he didn't feel them, so they grew MASSIVE and now affect the kidney function. Like they are 1 inch and there are more than one in each kidney. Last week they put stents to each kidney just to help the kidneys drain better, and the uro pulled 20 mL of pus from above one stone. He's on 2 abx from the infection he had.

Anyway, no way I'd let them leave me with stones for 6 weeks. Kick up a fuss!