>I would stronly recomend a 2.1.  If buying a long block, it is a direct fit
>and your FI will support it. I've done this many times.  I would look to find

If you buy from rebuilder/VW you may lose your core charge if swapping 
sizes, $600US on top of that $2350, ask carefully before ordering.   Tim