Freelander 2 litre DI wont start without cold start

Hi there , I have just bought a non runner 1999 2 litre DI . when I got it the guy b4 said the timing belt had snapped so he changed all the bits needed and also put a second hand head on it, I checked the timing and it seems ok and I also took out the glow plugs and checked them on a battery, they all glow, on trying to start it , it just turned over not trying to start so I sprayed some cold start in and after a little but kicking back it started , was really smokey to start with but this went away after a few mins, I let the engine tick over for about 10 mins untill it reached its temp but when I switched it off and tryed to start it off the key it wouldnt start, theres plenty life in the battery and it starts no probs with easy start....anyone got any ideas? thanks in advance. Oh PS I had the injectors checked and they are fine......HELPPPPPPPPPPPPPPPP

unless you want loads of crank calls remove phone number and use pm,good luck.

removed it cheers lol

always woth checking the stop solenoid is wired correctly.... it may be cutting the fuel whilst the starter motor is working..... try a temporary live feed straight from the battery to stop solenoid to bypass all the wiring and ignition switch.