It sounds like you are doing all of the right things. I would add in to observe your hydration -not just water but add in electrolytes as well, this has a huge bearing on kidney stones. You can also look up an at home IV company to come and do a vitamin cocktail to get your body back on track. We use one whenever we are feeling very run down and it can help balance fluids. I would continue with the capsule of lemon oil but also add in another capsule with half helichrysum and half cistus for a week. The K&B will be fantastic for maintenance, it has juniper berries which enhance the bodys efforts to maintain proper fluid balance, parsley which supports kidney and bladder function and urva ursi which supports both urinary and digestive system health. It also contains geranium, fennel, clove, roman chamomile, sage and juniper oils -anti microbial and anti inflammatory compounds.