Post Root Canal Treatment Infection

Hi There.
I recently had a problem with one of my teeth, it was infected and two weeks ago I had root canal treatment preformed. The dentist placed a temporary filling in and I was going to go back three weeks later to finish the root canal.
After the intial temporary filling, there was alot of pressure building up around the tooth and I took amoxicillin which killed the pain and throbbing after about three days. I took the full perscription (one weeks worth). Another week went by fine and then the pain and discomfort started up again about 3 days ago. I got another perscription for amocicillin from my dentist and started it  a couple days ago, but I also went to the dentist yesterday and had him remove the temporary filling to let out any pressure.

Anyways the tooth doesnt hurt now but the side of my face is swollen. Yesterday, The dentist told me if the tooth still hurts he could cut into the gums to remove something. I'm just wondering if the amoxicillion will take care of the swolleness/buildi up or if I should go get the 'apicoectomy'. My root canal is supposed to be next week.