Oil is always going to play a part in US policy towards Saudi Arabia but I think right now our intentions towards Iraq are playing a much bigger role in the White House.
It's no secret that W, Rumsfeld, Rice, et. al. are setting their sights on a US/Iraq war before the next presidential election. In order to engage in such a war, the Pentagon is probably pushing foreign policy in the direction of keeping Saudi Arabia's rulers on our side so that we can use their land for staging attacks.
I suspect that in the formulation of our current foreign policy there is a machivellian belief that if we can uninstall Saddam, we can install a friendly secular government that will be more open to us with their oil and which can then effectively neutralize Saudi Arabia's economic influence over us.