We've got the following Crank sensor connected to the EJ20G ECU in our swap:
DENSO 22053AA010
2 wires: red, yellow

And this is the Cam sensor that we're using:
3 wires: red, white, black

Are the above sensors the right ones to use on the EJ20G with the EJ20G ECU, or should we use the newer-style Impreza ones:
New-age Crank Sensor (2 wires, plug right on sensor):

New-age Cam Sensor (2 wires, plug right on sensor):

Last, but not least, how can we measure if the crank and cam sensors are sending out the right signal? We're suspecting that one of them cam/crank sensors that we're using in our EJ20G swap is loosing signal over ~3000rpm and it's causing the engine to cut-out at that rev-range.
Thanks,
P.