classic gallbladder symptoms. ?

So ever since i got pregnant with my daughter i have had upper right quadrant pain..also pain in my back. Ultrasounds and every other test came back normal. My doctor kept telling me i was having muscle spasms in my back because when i lay flat on my back it hurts so bad. I am 27 years old, never had issues like this before. I dont have pain all the time, but its becoming worse every day it seems. My endoscopy was normal. I went for hida scan. My upper GI says my test started out slow at 47% but then slowly crawled up to 85%. Everyone says i have classic gallbladder symptoms. Monday im scheduled for surgery, my general surgeon who i was referred to says i have biliary dyskinesia. I am scared because i just dont want to get surgery for no reason, but i am in pain!! Im nervous im going to be sick all the time....even though i dont get sick now i just have pain. Some days the pain is so severe, and i think im going crazy because my GI says all my tests are normal. Has anyone had this problem , and had the surgery and there symptoms have improved?