My previous dentist damaged several of my teeth, and he had given me two root canals (both of which needed to be redone.) I have had a lot of tooth pain in the past year as my new dentist works on fixing all that the old one screwed up. I can tell you this, you are not going to be able to diagnose yourself, you need to talk to your dentist and you need to get this taken care of quickly, because it will not get better on its own.
It depends on the cause of the pain, if you have an infection, or abcess you will probably need antibiotics. If your tooth is inflamed, ibuprofen is your best bet, but not a small amount, you need something bigger, my dentist had me on 800mg of ibuprofen until I saw the endodontist. From what you said about warm rinse making the pain go away, it is probably not an abcess, so you should probably call your dentist, ask about the ibuprofen and go with that.