The DSM-5 Combined Vaginismus and Dyspareunia into One Disorder

The DSM-5 combined Vaginismus and Dyspareunia into one disorder.One reason FOR and one reason AGAINST this proposed change is that:

A) clinicians are not well-able to differentiate between the two; however most women with Vaginismus demonstrated avoidance behaviors during the procedures of a study whereas the women with Dyspareunia did not
B) there is overlap between features of the disorder; however Vaginismus does not have a clear basis in anxiety as does Dyspareunia
C) both disorders have a basis in anxiety; however only Vaginismus is typically present at the moment of orgasm whereas Dyspareunia dissipates with sexual response
D) both disorders have a clear physical basis; however their physical bases are different
E) there is overlap in the physical correlates of the disorders; however Dyspareunia does not have a clear basis in anxiety