Whatever you do, don't do anymore. Personally I would advise shaving for a few weeks beforehand so that the hair growth cycles are uneven (it reduces the ouch factor a lot). Then let the hair grow out to about an inch or so; at which point you can then wax with much less pain.
After you start waxing you may find it easier just to get an epilator. Since hairs grow in finer after you wax epilating won't be much more painful than waxing. I'm quite hairy, and I've carefully thought about the steps that I should take.
I can't vouch that it will work 100% perfect, but I think it's a good theory for a hair removal process.
Good luck