In my opinion, the solution is as simple as can be – create a teleport and use magic spells of all schools for oil. There will be enough good spells left on the ground, and you won't have to worry when water-fire comes.
Also, its advantage is in its supposedly easy implementation.