If you can bear it, let it grow out completely and rest for a couple of weeks. When I first started shaving I had a similar thing, and it carried on with very little relief, then as I am still rather closeted I let it grow out for vacation, so about 8 weeks it was left to fallow, the next shave resulted in far less irritation, not completely free but better, but again the situation remained constant with the same areas being irritated until the next vacation, and again this time when the forest was cleared there was very little irritation, I still get it sometimes around the waistband or if I trim the bikini line closer, but at the end of the last vacation I shaved on the last day and hopped on a 14 hour flight with no problems.
Of course everyone is different so your mileage may vary, but for me hopefully when I finish my current vacation I'll be free of the bumps, and really starting to think sod it who's going to notice my legs anyway for the next one.