Sam i have the same setup as you and my TPS wires do need to be switched due to the pectel board you have in the ECU.
Also the CPS wires will need to be reversed due to the polarity of the sensor.
Map sensor wires shouldnt be cut for any reason if you can help it!
Other than that all the wires are the same for a 2wd or a 4x4. So if you have fitted a loom to your car and its not working either the loom you have fitted has issues. Or the sensors and components on your engine bay are faulty or not plugged in to the correct plugs or out of adjustment etc. Check the gap settings on each trigger.
Best bet is take it back to jano's and get him to install a loom for you to save you the hassle you have had for so long with secondhand wiring looms.
See you there Danny.