Jeff    since you have the parts for an inline install, I'd say quit
messing with the WBX and just do the inline.   If you use  the 1.8 lite
motor with Digifant engine management you don't have to mess with much at
all...Everything is pretty much the same between those inlines and the WBX.
  You can probably find one for about $200...and then you won't have these
ongoing issues with leaks and stuff.   I got my van with a 92 rabbit/jetta
1.8 liter motor and was happy with that ...probably the same HP as the WBX
motor and no leaky....
   After a couple of years  when I found a good deal on an ABA.  ($300
complete) I kept the head and Digifant and bolted that onto the ABA 2.0
liter block.   Many say this hybrid motor is just as good as an ABA
complete...I don't know about that but it works great and it's dead-nuts
simple...I don't need the ABA OBD stuff, nor did I want to mess with
swapping all the electronics and building a bump to clear the manifold...
 Took me about 3/4 of one day to swap that motor into my van rather than
the 1.8...It is more powerful than the 1.8...

   You said you thought you'd done everything just right and very carefully
and you still leak now..Why take the chance that that same scenario won't
replay next time?   Get a Rabbit and stuff that in there with your already
in hand diesel parts....