hi dear, from your history i get a feel that it might be a fungal infection
or may be a bacterial and fungal infection. usually fungal infections are recurrent and spread to partner. also pigmentation is more common with fungal infection. i will suggest you to get culture and sensitivity of your discharge done. this will confirm exactly what you have got.