Contractions advice?

Catie
Sorry in advance for the long story!
I am getting two different opinions from two different doctors, neither of which I know well. I am 29 weeks today, and my regular OB, who I LOVE, went on maternity leave, so I am seeing one of her associates in the meantime, though I've only briefly met this doctor once. My first real appointment with her is in two weeks.
I have PCOS, and had multiple miscarriages before conceiving this baby with the assistance of fertility treatments. I have had a few complications come up during this pregnancy, but nothing super serious. I have wound up going in twice for regular Braxton Hicks contractions (once to the ER at 16 weeks when they were every 10 minutes, and once to the birthing center when they were every 5 minutes). Both of those times the contractions were painless, likely caused by walking too much and being slightly dehydrated. I have been careful about drinking plenty of water this entire pregnancy - I keep track of how much I drink and ALWAYS drink over 100 oz of water per day.
Anyway, yesterday I started having regular (what I thought were BH) contractions again, but they were painful, and constant if I stood up. I called my 'new' doctor's nurse line and was told to drink at least 2 glasses of water, take a Tylenol, take a bath, and then lay down, and to come in to the birth center if they didn't stop. I did all of that, and they didn't ease up, so hubby and I headed in last night. By the time we arrived at the hospital, I had drank over a gallon of water throughout the day, so I definitely didn't think dehydration was the cause. Sure enough, they tested my urine and said I was plenty hydrated, so they hooked me up to the contraction monitor. At this point I was having contractions every 4 minutes, lasting for about 50 seconds each time. The doctor said they definitely weren't Braxton Hicks, as they were painful and reaching the top of the chart on the monitor (the BH contractions I'd had before just showed up as slight increases in stomach pressure or whatever the contraction thing monitors, never huge increases). 
They hooked me up to an IV and gave me Procardia and a shot of Terbutaline, which stopped the contractions for about 20 minutes, before they started up again 10 minutes apart. During this time, they checked my cervix (I wasn't dilated) and gave me a FFN test to check for preterm labor (negative). After watching me for another hour or so of contractions 10 minutes apart, they gave me more Terbutaline, which briefly stopped the contractions again, before they started up again at 10 minutes apart. After another hour, I had more Procardia - no change. 
At this point they said I could go home and sleep but was to be on strict bed rest. They said I had already had the max dose of both the Terbutaline and Procardia, which should have stopped the contractions, but just slowed them down. Since I wasn't dilated, they said to just go home, not get up except to go to the bathroom, and to call my regular doctor and tell her what happened. The doctor at the birthing center said my doctor would likely want to see me ASAP, and put me on daily medication to try to stop the contractions. She also said to come back in if they get closer together than 10 minutes again.
We left and went to sleep, and I called my new doctor (that I haven't really seen yet) this morning. The nurse just got back to me (8 hours later) and I told her everything that happened last night and what the doctor had said and told her that I had still been having strong contractions all day, every 10 minutes laying down, but that I instantly have constant contractions if I stand up. Like, every 1-2 minutes, my uterus basically never relaxes, and that they are painful enough that I can't stand up straight. She told me that my doctor said to hydrate, but other than that they were just Braxton Hicks since my cervix wasn't dilated. She said I didn't need to be on bed rest, and basically that I was fine and just needed to drink more water. I also asked about being prescribed a medicine to help relieve them and she said I didn't need it. She didn't ask to see me, other than at my next appointment on April 12th.
The doctor last night that actually saw me was very insistent on bed rest and said these definitely weren't Braxton Hicks contractions, and stressed the importance of seeing my regular doctor ASAP, but my regular doctor told me, without seeing me, that this was no big deal and I just need more water. I feel like she totally blew me off, and that I really should be checked out again since I am still having contractions regularly, especially when standing. I'm hydrating plenty, so I don't think that's the problem. Should I stay on bed rest like the doctor said last night, even though my doctor told me it wasn't necessary? Who should I listen to? 
I feel like this has mainly been somewhere for me to vent about my frustration with the doctor, but I am genuinely at a loss for what to do next. Just sit tight until my next appointment in 2 weeks? Has anyone else had this happen?