Is it a must to remove gallbladder for right upper abdomen pain?

Hi doctor,

About a month ago, I experienced acute pain in my right upper abdomen and that radiated to my back. It happened after I had a high fat meal that night. The pain lasted for hours and continued as a dull ache for the next week. I made an appointment with a gastroenterologist and he advised an abdominal CT. The report revealed that besides a mildly hydronephrotic kidney, for which I have already seen a urologist, everything else was normal except for the following. A focus of calcification is in the gallbladder lumen or the posterior gallbladder wall. The gallbladder wall is minimally prominent. However, the gallbladder is collapsed. All of my laboratory blood work showed that my kidney, liver and pancreas functions are normal. The gastroenterologist did not really give me any insight. He said to find a surgeon in case I have another attack, so that the gallbladder can be removed. I have found a surgeon, but I would like to get a second opinion from a different gastroenterologist. I have had a dull ache since the initial attack, but I have not had any more excruciating pain. Should I wait to get the gallbladder out if I do have another attack? When the report says focus of calcification, does that mean I just have one gallstone? Though I do not have any extreme pain, is this an emergency? Any advice you can provide would be helpful.