There are Vaginal wipes...specially made for the outside of your lady parts. Waxing is also a better way to rid yourself of excess pubic hair, A nice clean trim and wax should get rid of those irritants.
Shaving is sooooo 1970's and can cause you unnescesary irritation, and can leave you with a razor burn and bumps. Not to mention that you will have extremely uncomfortable stubble in a couple of days, which will be ten times more irritating.
Just remember wipe from the front to the back we don't want any nasty feces getting into your ladyness and giving you an infection.
As for the itchyness and discharge....you'll just have to wait for the doctors analysis, and I'm not going to tell you not to worry. Cause girl...I'd be going crazy with worry!! Cause right now I'm going through almost the same thing?