It could be the wiring too, don't assume the sensor is bad yet. With an engine swap I always assume it's the wiring first and troubleshoot from there. You'd do that too if you'd see the swap wiring atrocity that I've seen.

CYP is cylinder 1 position sensor if I remember correctly.