About the oil pump.  Actually with my conversion, using the diesel stuff, all
I had to do was to put the pickup tube on the exsisting oil pump that the 1.8l
JH motor already had.  I tried to use the diesel pump and found that the drive
shaft for it was not the same length (I forget whether it was longer or
shorter) so I just put the stock pump back in and attached the diesel oil
pickup tube.
So actually you only need the diesel oil pickup tube from the dealer or parts
place.
Just FYI.
Ken Wilford
John 3:16