Your symptoms do match that of an infection, and to prove this theory is the fact that you responded to the antibiotic therapy, although not completely.
In my opinion the best investigations would be a urine culture and sensitivity examination, a vaginal swab test culture examination and the addition of a utine alkalizer to your treatment regimen as this will help in reducing your symptoms of burning.
Also drink plenty of water and have cranberry juice (if available). Also abstain from all forms of sexual contact till your doctor deems it safe.Adenomyosis
is a condition in whoch the normal inner lining of the uterus
called the endonetrium os found in the muscle layers of tbe uterus. This could present with some complications in the future, which is why it will have to be adequately addressed.
Yes, you will certainly be treated completely; the most important factor here would be to use the right medication, dose and for the right duration. Hope this helps.