You may have already figured this out, but I played around with this a couple of years ago and found just using a common level shifter to work fine. This is the diagram I used.
If you want the RPM signal, add a 1.5k resistor between the gpio pin you choose and 3.3v