attacks post-cholecystectomy and post-sphincterotomy

Hello.  I had a cholecystectomy in Jan 1998, at age 20.  I was told by the surgeon that my gallbladder was "rotten" and probably not functioning since birth.  Around 2006, I was having attacks again and had elevated liver enzymes.  I finally saw a GI specialist who diagnosed me with sphincter of Oddi dysfunction.  In early 2007, he performed a sphincterotomy via an ERCP.  In addition to cutting the sphincter, he also cleaned out the ducts (which were all clogged again) and placed a stint for drainage.  That did the trick for quite some time.  It's now Sept 2010, I am 32-years old and am 23-weeks pregnant with my first child.  I have had two of what I would consider gallbladder attacks in the last few months.  The latest was today and lasted about 5 or 6 hours.  It was exactly how I remember my gallbladder attacks 12 years ago and my Oddi attacks 4 years ago.  My GI doctor thought what he preformed with the Oddi would do the trick and I wouldn't need to be back for a "tune-up" (as I asked him!), but I'm afraid that's what's going on.  I'll obviously follow-up with both my OB and my GI specialist, but I just thought I'd get another opinion as well.  Might this all be connected to my past issues?  Did the pregnancy bring it out again?  Will I have this trouble for the rest of my life?  What can I do?  Thank you so much for your help.