Just get hold of the correct CE2 loom and plug it into your fusebox, no need to mess about splicing.
Not thought about putting a better engine in? If you want to stay 8v you could fit a 2 litre Mk3 unit as this loom is plug and play too and probably lower mileage and cheaper.