GSXR cam sensors

Hi all, I have read of problems with the earlier standard 2 wire Suzuki cam position sensors with M400. We have one on a GSX based drag bike engine and it seems to be giving us trouble, with an offset signal.
Was wondering what people are using, aftermarket or the later 07 up 3 wire Suzuki sensor?
Was wondering what people are using, aftermarket or the later 07 up 3 wire Suzuki sensor?