20v conv (AUQ) DBW specific query

i know theres lots of information on 1.8t 20v conversions but its 95% on aug models with cable throttle and using the seat conv for the hydro clutch.

i will be using a AUQ  (180bhp) from my own mk4 golf its currently still in the mk4.

if anybody here could advice me on what is to be done with the tensioner  i read that the earlier model 20v like the agu need a mk2 tensioner and then spacing it out 6-8mm but does this effect the auq model 20vs? i think the tensioner on my engine is part of the internal water pump system so does anything need to happen here?

also the pipework/hoses what would be my best option for figuring oout what can be done away with and what needs to be kept.
ie do i pull the donar engine from the mk4 with as much left connected as possible to keep a rough idea of what goes where for when installing it..

or do i strip it back to bare block and head and start from scratch when putting it in the mk1

i have not worked on a turbo engine before only the old 1.8v original so the bay of the mk4 looks like a spaggetti junction of hoses and pipes in comparison.
i would like to have the bay as clean and empty as possible without making the car un drivable, i am having my column modified to run a full bias set up to do away with the servo/bar brake set up and to accommodate the dbw  pedal from the AUQ at the same time.
i am in essex /  east london if theres anyone fairly local with an auq set up that wouldnt mind me popping round to have a closer look at it would be much appreciated. or if anyone can point me in the right direction of someone who will make and fit some tasty boost pipes for me.

 any other info regarding the dbw installation/set up  then thanks in advance 

Having fitted the alternative adjuster involving the 8mm spacer to an AUQ engine myself, yeah it just fits as described, nothing to do with the water pump

Nice carp Dan, How you getting on with your conversion ? I'm in two minds about doing one myself.I bought a cabby which I'm hoping to drive as much as possible in the spring .I have  a 1.8T and a Tdi engines but I'm not sure what to use.How far along have you got? How are you finding the wiring? Are you doing everything yourself ?