1) It is just waste of time if you try to clean the oil. Use new oil. Your time also costs $$$. Remember, your supervisor pays to hire you to work in the lab.
2) For water contamination in the oil, my practice is heat the oil bath to 120 to 140oC with a alumninum foil covering it. Water gets evaporated and leaves the oil clear again.