Suffering stomach pain

Hi all, i have resulted to try and seek some advice on this forum due to pain i keep on suffering with.
I'm 34 years old and was diagnosed with IBS after a colonoscopy and Endoscopy at the age of 28. Symptoms were mainly bloating and diarrhoea. I had an ultrasound at the age of 25 showing i had gallstones but was told they were small and nothing to worry about.

May 2020 during the first lockdown i started getting awful pain in the pit of my stomach after eating. It was mainly anything I ate caused me pain. I also noticed pain under my right rib cage and right shoulder blade. My doctor said it was stress causing excess acid and an endoscopy report showed i had non erosive gastritis and a hiatus hernia of 1cm. I wanted some more answers so paid for an ultrasound which showed again that I had gallstones. Since then I have been on and off of acid tablets. Yesterday and today I had pain after eating breakfast, the kind of pain where all you want to do is curl up in bed. The pain always starts around 20 minutes after eating and then subsides after 30 minutes. My doctor thinks it is gallbladder related and thinks I should have it removed. I would really appreciate any comments or similar stories to mine, even recommendations for any specialists. Thank you in advance.