Don't demobilize the EGR as they don't like it, and can cause this 2000 rpm misfire thing with smoke, make sure your engine temperature reaches normal after a short drive and check none of the vacuum pipes have perished, also check the EGR is not gummed up.
Nice car, same colour as mine