It is impossible to tell the whole oil story, but perhaps I can offer a few insights regarding where we are today.
 We already seem to be back to the falling oil prices and refilling storage tanks scenario.
US crude oil stocks hit their low point on January 19, 2018 and have started to rise again. The amount of crude oil fill has averaged about 365,000 barrels per day since then. At the same time, prices of both Brent and WTI oil have fallen from their high points.
Many people believe that the oil problem, when it hits, will be running out of oil. People with such a belief interpret a glut of oil to mean that we are still very far from any limit.
 An alternative story to running out of oil is that the economy is a self-organized system, operating under the laws of physics. With this story, too little demand for oil is as likely an outcome as a shortage of oil.