It's time to refuel with oil stocks - but should you buy BP or Shell?

Fortunes have already been made from the oil price boom sparked by the war in Iran, and there are likely to be more gains to come.