I got a heap of these recently:

SN04-N DC 10-30V NPN NO 3-wire 4mm Inductive Proximity Sensor Switch Detector | eBay

There's good reviews about them on CNCzone. I'll post when I've tested them, but that may be some time.