Your GP seems 2B hinging on anything other than VA  

 and I would be speaking to the Practice Manager about VA being diagnosed without treatment being recommended. That IMO is medical negligence.  Obviously noted by a woman who has never suffered  
 
Don't worry about the 12 months wait, do ring the Clinic and ask if it's possible to take a cancellation/short notice appt.  It's better than an appt. being wasted.  
Also your GP is wrong to insist on an examination of a woman suffering pain.  Her time will come !!! hopefully.  
Vaginismus usually starts in our teens.  It isn't something unless 1 has suffered rape that will develop in our later years.  Have U had problems with intimacy ?  It's more likely to be vaginal atrophy - mayB buy her a copy of 'me and my menopausal vagina' ;-).  Also your Practice Manager.
I never have problems with bathing products other than crystals.  One needs to apply something to prevent drying of the skin, either during or after bathing.  I use 'ovestin' internally with a little smear externally as well as 'vaseline' hand cream [in the yellow bottle] on any skin that is dry.  DH uses Nivea on his legs.