Gallbladder stones ? dull pain, sometimes pinching around th

I had my gall bladder removed 3 years ago April. After operation I was still in pain. I had 2-3 ultra sounds, ct scan and colonoscopy. Everything came back normal except the ct scan showed a small liver cyst not seen on ultrascans. Afterwards felt some relief that it wasn't serious and soon I began to feel better until about 2 weeks ago. The day before this all began I had drank tequila. I began having upper right quadrant pain that goes into the back area. Sometimes a dull pain, sometimes a pinching arouind the rib cage to the back. When I lay down on stomache it feels like something is there along the bottom of the rib cage. After a couple of days I went to the doctor. His nurse did a urinalysis I had a slight infection. Also lately I have been feeling a sensation in my throat when I swallow. I was diagnosed with a hiatal hernia 20 years ago. The doctor prescribed an antibiotic and prilesec for my throat. It has been a week, and no relief. I am going back on monday. Any suggestions?