Painful penetration. Be something else?

I've been married for 2 years. I had no problem during sexual intercourse so far. Recently I've noticed that whenever my husband comes home for holidays (we live in different cities and meet every month) I get pain during the intercourse. It feels tight as if it's being blocked. I noticed that there was swelling and itching in the vulva after shaving. (I shave regularly) I thought it might have been because of a new shaving cream.  So I used clean and dry cream for one week and the swelling and pain during sex was gone. Same thing happened again but there is no swelling. I've decided to quit shaving for now. Is it because of shaving, I could've accidentally hurt my skin and inflammation around the vulva. Could it be something else?