Contracted Gallbladder

hi! I am 48 years old Indian working in Afghanistan. Couple of years ago, I had high bilirubin (ranging from 2 to 3.7) for 3-4 years, but without any other abnormalities...now my gallbladder is contracted with normal wall thickness -2.0 mm. There are multiple calculi of up to 5.7mm size seen filling the contracted lumen. All other organs (Liver, Porta, Pancreas, Spleen, Kidneys, bladder and prostrate are normal in all indicators (size, echotexture etc).
Doctor's impression reads: Cholelithiasis with chronic Cholecystitis
Do I need to undergo Surgery to remove the Gallbladder? Rarely, I get slight abdominal pain in early morning hours that goes away by simply shifting my position (turning on other side etc). Will this condition eventually lead to complications and more damage? I am trying alternative methods such as dietary changes and gall bladder flush..