How To Treat Numerous Gall Stones And Shrunken Gallbladder?

According to my ultrasound, I have numerous gallstones. I was told not to worry (last year) about asymptomatic gallstones. In the last two weeks, I had severe pain (5 times) - on alternate nights from upper abdomen, radiating to the back. A new ultrasound confirms the existence of numerous stones, and a shrunken gallbladder. Otherwise, there are no other emergency signs - like gangrene, pancreatitis, etc. Gall bladder removal still seems elective, and I m doing a wait and watch after talking to a general surgeon. When should I get alarmed? What should I watch out for to schedule surgery?