Douglas:
Well, it's good to see that your original problem is resolved. Looks like it was the battery.
For the engine, set the high-speed needle to 1 1/4 turns out from the fully closed position. Do not touch the "sub-needle". That needle is set at the factory.
For the pump, try different positions like Adrian said, but the movement is (IMHO) more than 1 mm each time. The factory recommended method is 1/8 turn each time you wish to make it richer or leaner. In my experience, the CDI engine, after running for an hour, like a lean pump setting - that way, it idles well.
To understand precisely how the pump works and how to set it up best, read Troy's blog at:
http://www.patternflyer.com/troy/?p=92. This link gives you all the dope you need to know about running the DZ.
Looks like you're getting close. Best of luck!
atul