I've also been thinking of a TDI swap into something 4x4, like maybe a Suzuki. These guys make great adapter kits.

http://www.acmeadapters.com/index.php