Hi Andy,
I'm new to posting replies so please bare with me. I was diagnosed T2 In November 2014 and had a similar problem as yourself. The GP was convinced that I had thrush which reoccurred all the time. However after pushing for more tests I was diagnosed with Balanitis Xerotica Obliterans...