I can't give you any recommendation about diet, but hubby inherited his kidney stone problem from his father.
We moved to a new area and the urologist he saw told him to mix 4 ounces of lemon juice in 1/2 gallon of water. He is to drink this in place of water. My husband thinks if that much is good, twice that much is better. He does add some sugar because it is tart.
He is also taking an herb which I will be glad to pass on if you want.
In the past he has had nausea and pain when he was passing a stone and it would last for a number of days. Since he started the lemon juice and added the herb, he may have a little pain that lasts one day and several days later pass the stone. Most of the time he doesn't even know he passes it until it hits the toilet.
His stones are calcium. We had them analyzed.