Feeling anxious with pain in upper right quadrant

Hello, this is my first post on here.
Bit of a history to my symptoms.
Strarted with upper pricking pain in URQ a couple of years ago especially after eating. All bloods came back fine so paid for an Mri with contrast for liver and organs. All came back fine. Had an endoscopy and found I had dysmotility of the oesophagus and was out on omoprazole 20mg. Which did stop the pricking for a while.
Recently been on 3 lots of antibiotics for an infected tooth and extraction. Visited the Dr as pain has got worse and now more constant with a dull ache in the upper right quadrant. He thought I had bilhary cholic and put me on penicillin.
Didn’t help at all. Found I am anemic but I am peri menopausal so could be connected to that.
Dr has now sent off for tests to be done and scans. Seems to think it’s not my liver but my gall bladder. Also wants me to have an colonoscopy. He is being very thorough. I do enjoy a few glasses of wine with my husband over a meal and have done for many years so my worries are it could be the liver. I’ have also noticed a couple of my finger nails are growing downwards!
Just wondering if anyone else has had these symptoms?
Thank you in advance.