Some might not be aware of Jim Connel's VW shop in Leeds, AL.

http://jimsaircooled.com/home

I bought the current engine in Ol'Red from him off the shelf back in
January of 2000 after mine exploded on a trip through Oklahoma. That
engine is still running strong today. I went to see him about building
me and engine - and he had a 2.1L WBX just sitting there that he had
just finished. Since mine was trashed - I just bought it from him
outright. Never had a lick of trouble with the engine per se since new
from him - but have had problems with the add-on stuff - alt, PS pump,
etc - but that's not really "Engine Stuff".

I recommend him.

John