my vagina is irritating me

So my boyfriend is coming over tomorrow and I know we're going to have sex and when I have a clean shave it turns him on even more. So I made sure I was hairless and I used my razor. I had ran out of shaving cream 3 days ago. so today I just used a moisturizing soap to shave. BUT the only thing is that it's irritating. A few mins ago I mixed warm water with a tiny bit of alcohol and sat on the toilet to make sure no bacteria or anything got into it. And rinse it with cold water to close my pores. But what should I do for the irritation!? and what do you do when you shave your vagina? I wanna try waxing but I don't want ppl looking up my vagina and also I can't take the pain. So what should I do!???