You need also to modify the lever assembly, It's the one screwed with the triangular bolt each side of the pump, to make more motion to the control collar..... but like you describe, It's better than a stock AAZ pump motion.
You are good, but the only pieces that you have to put in the garbage It's the TDI pressure relief valve, It's not conceived to work on the mechanical pump, because the internal pressure on the electronic pump is setting higher than that is required for the timing piston, and It's the N108 wich bleed + or - the pressure at the back of the timing piston to set the timing at what the ECU request... so this pressure valve is setting at the max and have a softer spring on it, too soft to mach with a mechanical pump.
With TDI came plate and 10mm head.... PM me I will give you what is the correct pressure valve (regulator valve) and adjustment procedure to work with your internal pump set-up.
I take into consideration that you have install the TDI came plate and TDI 10mm head in your AAZ pump, if not the explanation are not totally good for you.
Also, the AAZ timing piston system is better and easier to adjust than the TDI one you install.
Set the initial timing at 1.00mm dial gauge and... enjoy..!!