how to get rid of shaving rash fast!!

I went away with my family for a holiday and had to shave my bikini area, however when I get back home to my boyfriend it is his birthday, and I want to spoil him in the bedroom. However I have this shaving rash down there, I have been good and trying not to itch, but does anyone know a way to get it to go away fast? Also as the hair has started to grow back, if I go to a salon will they be able to wax the area or will it be too short?