Modifying the filler neck is way easier than buying and swapping in a diesel fuel tank. The FWD diesel pump will drop into the 4motion sending unit without too much trouble, and the FWD fuel line assembly can also be swapped over, just cutting one of the hard lines short on the tank end (line assembly has a sort of cooler built in as well). Personally I think it's better to swap out the pump rather than put a tee in the fuel lines, as you'll end up with more consistent pressure to the tandem pump, and there will be no possibility of over-pressurizing it.
The 6-speed from the FWD car will not be usable in a 4motion car, but the clutch can be reused. Easiest transmission to use would be to get a 5-speed 4motion diesel transmission from Europe with a matching rear diff. If using a 6-speed diesel transmission, the driveshaft will also need to be imported, unless you can find a very rare factory W8 6-speed manual driveshaft here in North America. Another transmission option is the GVE 02X 6-speed manual from a B7 2.0T car, which would work with a factory auto 4motion driveshaft. Gearing isn't as long as a diesel transmission, but they're pretty commonly available, and gearing is still fairly good. Using the 02X comes with a couple other necessary modifications (like a custom trans mount solution).
Depending on what transmission you go for, and what transmission the donor has, the 6-speed shifter from the donor may be usable or the 5-speed shifter from the 4motion car may be able to be reused.
The factory 1.8T transmission will bolt up, but fuel economy will suffer considerably because of the gear ratios.
Aside from that stuff, and some wiring (year of the 1.8T car will determine how involved the wiring is), most other stuff is pretty self-explanatory, especially if you have the full diesel donor to use. Swap the cluster and lock cylinder from the donor to avoid any immobilizer issues. Since the donor already has a manual conversion, you may not need a tune at all (ECU does not care AWD vs FWD since the AWD system operates entirely mechanically). The one thing that may cause issues is if the 4motion car has ESP and the donor does not. If the 4motion car has ESP and the ECU isn't compatible with that, the ABS/traction control light will be permanently on until the ECU is tuned for it. Either way, the ABS module will need to be coded with VCDS to communicate with the diesel ECU.