Why would someone short the oil switch wires? - the oil switch wire should be black/yellow or yellow/black (cant confirm combo now) and leads to the body plug near the ECU - its best to just take a connection from there to the cluster - the alternator light wire also ends up there (I think yours must be connected to the carby wiring which is in the fenderwell)
the E21 should go to the sensors and then to the same ground as your E01 (engine ground eyelet) - It should already be in the original loom - someone mustve just snipped and tucked it away - its the thinner of the brown wires.
The best way to tackle such problems is to - completely remove the wiring loom and then trace every disconnected wire, connect appropriately with main and circuit opening relay, A/C clutch and rpm sensor, oil switch, alternator plug, temp needle etc. Then place it back in and connect to car appropriately