Bad news: my rebuilt 2.1 blew out this week after only 22.5K miles (160K on
chassis).

I am committed to this van - bought it new in '88 - and want to do the power
plant right this time. The last two days have been spent searching the
archives trying to come up with the best solution. A lot has been learned
but not enough to make my final decision - I need help from this group.

The following engine options are under consideration:

Rebuild (hesitate to do this since the last rebuild was good for just 22.5K
miles plus leaky heads, expensive exhaust system, weak water pump).
Subaru Conversion
golf/jetta I4  conversion
Tiico
TDI conversion
Open to other suggestions

Below are the requirements this new engine should meet. Obviously all of the
options listed below can be achieved with enough effort but I am looking for
the solution that will meet these requirements in the simplest (not
necessarily cheapest) way.
1)      Closed loop engine management system.
2)      Digifant or better fuel injection system
3)      Stock tach and gauges work
4)      Stock AC, Power steering bolt on.
5)      More reliable than a stock 2.1 WBX
6)      Compatible with stock cruise control
7)      Serviceable by me and acceptable to competent mechanics
8)      Engine parts are generally available
9)      Same or better power/gas mileage as stock 2.1
10)     Cost under $5000 (including labor)

Here are the questions I have:

1)      Which of the engine options comes closest to meeting these
      requirements?
2)      Is there an engine option that cannot meet a requirement?
      For example one might guess the TDI conversion will cost more
      than $5000.

Thanks in advance for your help!

Noel '88 GL