Good points. In either case, I don't see the market crashing soon, and oil would have at least a few weeks of upside, if not longer.
There's more interesting news (there's been a lot of market moving news lately). China's planning to stop buying up so many US dollars... with their billion/trillion dollar cash and trade imbalance, they may well sink it into oil/gold (metals), and let the dollar rot (something Bush thought was a good thing for years). The consequences to us would be a lot of pain, even if the long term benefits are worth it.
That's going to change a lot of things. I'm still trying to figure out what myself.