(And then I cried, and the world didn't end.)
I'm disappointed, because I'd hoped he would be able to help directly. But maybe the counselling will help; I am sort of an uptight person, and a bit nervous about sex (especially since this has been happening), and it surely can't hurt to try and sort some of that out. He said if the counselling doesn't help, to go back to him. If that gets me nowhere, I will have to change GPs and start all over again.
BUT... after the doctor, I went home with my boyfriend, and we ended up in bed. And I decided we should try penetration again. It wasn't fully comfortable, and it did hurt when he went in past a certain point. But it was the first time we've actually managed penetration in a long time, and the pain was a lot less than it has been. So that was somewhat encouraging.