Great work on the engine swap, and excellent photos.
Just wanted to mention something, hopefully before you put the new engine back in. When I did the cambelt and waterpump recently on my 99 Coupe, I wanted to order a new cambelt tensioner (sits underneath the 2nd from left cam pulley, yellow dot in the centre on your pics). I was told that the design had been superceeded, and that a new tensioner and new waterpump design are now used. I ordered the new designs, and the tensioner is quite radically different.
I have put some photos of the new and old designs up on my website -
http://www.trackandrace.com/workshop , follow the V6 Coupe and 80k service links but I cannot link directly to the relevant photos.
Pug must have had a reason for superceeding those designs, just wondered if you had considered the option of replacing the cambelt tensioner.
Martin.