Swimmer's Ear

I went diving several times last week and seem to have developed a minor irritation/infection known as swimmer's ear. I know I need to go to a doctor, and I probably will if it persists, but has anyone else had this? It's caused by diving or swimming. My right ear is sore to the touch, and a little backed up.
Any suggestions for over-the-counter treatment?
Thanks!

To prevent it, and to cure mild cases, I use a 50-50 mix of white vinegar-90% rubbing alcohol solution - put it in a bottle that you can squeeze just a few drops from (old pool chemical test bottles, for example), then put a few drops in each ear after drying out after shower  and lightly and not to deeply  que-tipping the canals.   
    Wear Doc Pro Plugs for swimming, I don't know if you can use them when diving - I know they have a couple of styles, one with a very small opening, one without.
     My water-polo/ swimming son who was in the water 5 hours a day needed Rx drops from the doc, otherwise he'd get real serious ear problems.

If the vinegar and rubbing alcohol doesn't work, try a 50 - 50 mix of hydrogen peroxide and rubbing alcohol. I wear a hearing aid and was recommended this by a doctor over the store bought wax removers/cleaners. I believe that if the infection is a viral one, the vinegar will kill it and if it's bacterial, the peroxide will do the trick. If not, then visa-versa. Neither one will harm you. I use the peroxide/alcohol mix often and be forewarned, it will sound rather turbulent at first. Hope this helps.