Of course, gravitational potential energy of the system is higher when the oil is scattered temporarily in the water, because the water is higher than it would be in equilibrium state. However, I do not see how this has anything to do with the concept of entropy. The non-equilibrium state cannot be easily assigned thermodynamic entropy, because there is no obvious thermodynamic state variable that could describe the state of mixed water and oil. If you know how to introduce such a variable and corresponding entropy, then please explain it.