Trim, but don't shave. I made that mistake ONCE, and had some rather unpleasant experiences that kept me off my bike for 2 weeks. And this isn't just for the ingrown hairs. I gave myself some blisters in *bad* places. Frankly I figure it's better to have a hairy barrier between me and my shorts than no barrier at all.

If you're going to the beach or somewhere in a swimsuit, find a pair of cute boardshorts that go well with your swimsuit, and nobody will know the difference.

Hope you feel better soon!