Boils and whiteheads from not waxing anymore?

I never used to have any problems with my bikini area besides occassional razor burn. Well at the beginning of this year I started waxing and was very please with the results. Well towards the middle of the summer it started getting alittle expensive so I stopped waxing and started shaving again. Ever since then I've been getting really bad ingrown hairs, boils, and whiteheads all over my bikini area and they are scaring really bad. I asked my doctor and she called it something (tricha something maybe?) and basically said it's from the hair follicles or dirt being trapper under the skin causing these bumps. Well I've been tanning, using maderma, and palmers vitamin E cocoa butter like crazy to try and fade the scars. Is there anything else I can do? but most importantly, how do I stop these whiteheads and boils things from appearing?