I recommend drilling and tapping the knock sensor hole in the block to the correct size (M12x1.5) that you need for your existing sensor. Your ECU is calibrated to detect knock using that sensor.
For the oil pressure, why don't you just swap the sensors? One is not better than the other. The hole in both blocks is the same size. At times, they have used a pipe thread adapter between the block and sensor but they finally deleted it.
