Maybe I just need the slightly stinky soap (hee hee) for now. It does sound like Neem oil is a good item to have in the medicine cabinet, just in case.
The tea trea oil does seem to be working very well, sipping on green tea laced with Clarkia as I write. It is pretty tasty! :)