Outer Limits 4x4 Board

Hey Guys,
I own an 83 SWB Pajero Turbo Diesel, which has just recently had a second hand import engine fitted a few months ago. First it performed fantastic, then the timing belts (or something like that) stuffed up and now my car blows out a fair bit of smoke when taking off (since it has been repaired). I know that it is natural for diesels to blow out smoke when taking off, but I feel as though it is blowing out a bit too much smoke. I dont think it is the fuel pump or the injectors, as they are relatively new. My 4WD didn't blow out smoke when I first got the new engine put in it, but after the timing belts were fixed up or re-adjusted it blows out a little bit more smoke. It still performs great, but too much smoke for my liking. I am wondering if anybody could recommend a good place to go to get my diesel engine dyno-tuned and get rid of some of the exhaust smoke? I don't want to take it back to the place I got the engine as I am not happy with their service. I would really apprieciate it if somebody could help me out here, it doesnt matter which area of melbourne I have to go to, as long as I can reduce my car's exhaust.

Thanks,
Sam

where did you get it done before

AG Diesel NFI where
BJ Diesel Dande
Diesel Tek Lilydale

First i got it done in some place in Thomastown (cant remember the name) and they did a great job boostiung power and fuel economy and getting rid of the smoke, and then I got it done at AG Diesel in Westall who somehow de-tuned my engine which was pretty bad. I will look into the places that you mentioned- thanks for that. Any other places anybody has used would be great thanks.