Peter snuck a little item in there which I think needs to be asked directly..
Are you letting your glow plugs heat up 45 seconds before you try to crank your engine the first time ?
They continue to heat after the light goes off if you leave the key alone that 45 seconds... try this first if you have not been doing it.. time it .... don't pay any attention to how long the light is on....