Tonight I took the pumps apart and swapped everything, but I didn't expect a problem with the contol lever, so I'll have to look into that and modify it next week if neccesary, the welding and drilling shouldn't be a problem.
Now I have an AAZ pump, with TDI advance mechanism, TDI camplate and 10mm plunger and pump head. Orther than that nothing changed.
I noticed a few things:
When I had the pumps apart, I notced the TDI has an extra spring pressing against the camplate from the inside the AAZ doesn't have, I hope that won't be a problem.
TDI inside:
AAZ inside:
Also, having the pumps apart the differece between camplates is clearly visible:
TDI on the left, AAZ in the middle and 1,6 on the right.
TDI and AAZ both have 3mm lift, 1,6D has 2mm. Also the TDI has a much steeper slope on one side, so the AAZ camplate probably wouldn't have worked.
Luckily the 10mm pump head already had the holes for the conrol lever spring pre drilled, because there are no springs in the tdi pump, so that could have become a problem:
The advance pistons and covers don't appear to differ very much, onlt the spring is different, double for AAZ, and a single, thicker spring in the TDI:
when fitting the assembled pump, it turned out there is little room around the lda because of the fuel lines, but it is just enough for the fuel screw and out banjo fitting: