Strip the 2lt to the bare engine..
use an 1800 oil pump and water pump
1800 sump and oil pick up pipe.
then just put it in the cabby as if it was an 1800....
it will run pretty good on the 1800 management too as its got Air flow meter,
so the fuelling will be accounted for,,
bolt it in mate.