Treatment and follow up for epididymitis

I am a 30 year old male who was recently diagnosed with acute epididymitis.

Onset was quick, within 1 day. This persisted throughout the weekend, until i saw a doctor on monday. He visually inspected, and performed a urine sample. He prescribed Cipro which i have been taking for 5 days now. The pain initially got worse, then dramatically improved (i was able to stop advil/ice for pain control) by the end of the second day on the medication.

A few questions;

1. I still feel a small amount of pain/sensitivity in the right testicle/epid. area. I was told to take the Cipro for 5 days, however was given a 10 day supply. Should i continue the medication until symptoms completely resolve for 1-2 days?

2. There seems to be a small, hard lump remaining after the inflammation resolved around the rear of the testicle. Is this normal and does it warrant further study (ie. US, urological follow up)???

Thanks in advance