Conditioner does work well as a shaving lotion. I use Aveeno Postively Smooth and it works quite well.
Shave against the grain. Get a shower poof and exfoliate. And then exfoliate again
Get that dead skin off of your legs. That'll help with the ingrown hairs.