I would do a few different things. I would first change his food, secondly, don't condition his hair if it gets oily, just shampoo it and thirdly, I would add supplements to his food.
Make sure all the fleas are gone and you should start seeing an improvement pretty quickly