welcome to healthcaremagic,
since i can also listen to your complains and can not examine you, i can definitely say that you are suffering from an infection , but can not say confidently that it is a STD
get a culture and sensitivity of the watery discharge from the vagina , this will confirm the microorganism causing the infection.
in the mean time get your HIV
be careful to use condom every time you have intercourse never have an unprotected sex.
presently you need to maintain local hygiene and abstinence till your symptoms subsides completely.
you did not mention if there are any eruptions or pustules appearing in your private parts.
if there is any, fix an appointment with an OBG the sooner possible and get treated and investigated.
till then continue with medicines the doctor has prescribed you.