problems.........?

hello all. i'm in need of some help. i'm a 26 year old male, shave my , and masturbate regularly. i've been shaving my for a long time and ever since i did it for the first time, i have to keep doing it. if i let it grow out, its very unattractive. i also masturbate with oil based lubricant. since i've been doing all of this, i've noticed that i have a bumpy . i've been testing for STD's and my results were negative. here's my question, since i shave all the time and masturbate about every day and use oil based lube, is there something i can substitute for the oil based lube and something i can try for the bumps? my doctor said it looked like follictituc(sp). just inflamed oil glands. just the hair trying to grow back. i've tired water based stuff but it seems that they dry out quickly and get very sticky and thats not a good feeling. i've never tired silicone but i want something that lasts long, is somewhat thick and something that might make these bumps go away. PLEASE HELP!!!!!