Somehow I missed the update! I think regarding the stones which always bear the risk of blockage the surgery is the right option. Because a blockage is life threatening.

I wish you all the best and keep my fingers crossed