razor bumps from hell!

Courtney
What is the best way to get rid of razors bumps fast. I don't get them so much on the legs, but it my pelvic area and upper thighs that get the most horrible gross looking bumps the day after I shave. Right now I use an electric razor and trimming to get clear of the worst of it (before I use a razor). I always wait until the end of my shower, use a good shaving cream, and a new razor. I also put baby oil on that contains aloe and vitamin e on afterwards. 
It summertime and I'd like to wear shorts and bathing suits without looking like I've got a rash!  Plus it is kinda a put off when I want to be intimate 😞