Attention all dentists: root canal and sedation

Long story short: went for an emergency root canal procedure for my molar about a week ago but the dentist (he's not my regular family dds) couldn't finish it. He must have injected freezing 10 times or so but I was still able to somewhat painfully feel the tools in my tooth. He ended up filling my tooth with "medicine" (pasty white filling) and told me that I have an "angry tooth" and the inflammation was too great. I was prescribed amox/clav for 10 days. I have an appointment booked with him again in a couple weeks to finish the procedure.

Currently, I can feel the sensitivity from time to time. I am afraid that I will still feel the tools (grinding, etc) in that upcoming appointment. Should I go to a different dentist that does sedation???