Update: I've ran into a bit of an issue. While most of the sensors are the same between the two motors, one of them is different. There is a sensor on the stock D15B1, near the oil pressure sensor/oil filter area under the intake manifold, it appears to be a coolant sensor, but the D16y7 block...