If there is any part of you that thinks you need a new doctor, I'd start looking for one. A delivery can involve lots of split-second decisions, and you need to feel totally comfortable with whoever is making those decisions.
I go to a practice with 8 doctors. Meeting 8 doctors is less than fun, but I never have to wait for my appointments because someone is at the hospital on the maternity floor 24/7. They don't have to leave the office for emergencies since there's already someone taking care of all the emergencies and deliveries. Also, since the doctor is right there, it greatly reduces the chances that the doctor won't be around to catch your baby.