Trimming is probably the best way to go if you continue experiencing that irritation, usually known as razor bumps. Warm water or anything else that softens the skin, or aloe Vera and other things that soothe the skin, are likely beneficial as well. I've also heard that, and attempted, scrubbing the skin around these areas more vigorously to attempt to dispel the chance of hair getting caught underneath it…
Razor bumps are due to the way hair is curved, and how is it shaved away. If you stretch your skin when you shave, you're likely to trim off so much of your hairs that they will slide completely under your skin when you are finished. Having a curve, underneath your epidermis, and now having a sharp edge (because these hairs are often cut at an angle), the hairs will then dig into your epidermis and continue to grow there. The colloquial term for the inflamed skin around the ingrown hair, which usually occurs in a patch at a time, is what you're experiencing. Heck though, I've also had hair grow parallel with others, just under the surface of the epidermis until they break free.
So, umm, the things I've used and seen others use are Lavender and Moroccan Argan Oil.