Try letting the glow plugs work a little longer, once the light goes out give it another five or six seconds before starting it up. This has cured my smoke on start up and the lumpiness.
Hope it helps you, seemingly the glow plugs continue to heat after the dash light goes out.