I don't know what kind of air filter you have but the stock oil bath filter is the best. Keep the oil level up and they work every time, all the time.
My only concern (perhaps unfounded) with the oil bath is mine is the kind you can't remove the element for cleaning. Guess they can be cleaned well enough with lots of sloshing mineral spirits. You seem to have good success with it though.
